diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2012-03-08 10:17:21 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-03-08 10:17:21 +0800 |
| commit | 13ef39663552083235c2773c9aa8414a5be675ee (patch) | |
| tree | dbd5cfc35251ae2a60a93f3842d1acea862ab072 /t/t4150-am.sh | |
| parent | l10n: Update zh_CN translation for 1.7.9.2 (diff) | |
| parent | Git 1.7.10-rc0 (diff) | |
| download | tgif-13ef39663552083235c2773c9aa8414a5be675ee.tar.xz | |
Merge v1.7.10-rc0 for git l10n update
Diffstat (limited to 't/t4150-am.sh')
| -rwxr-xr-x | t/t4150-am.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 6f77fffee6..ccc0280f52 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -123,6 +123,7 @@ test_expect_success setup ' git commit -m "added another file" && git format-patch --stdout master >lorem-move.patch && + git format-patch --no-prefix --stdout master >lorem-zero.patch && git checkout -b rename && git mv file renamed && @@ -286,6 +287,20 @@ test_expect_success 'am -3 falls back to 3-way merge' ' git diff --exit-code lorem ' +test_expect_success 'am -3 -p0 can read --no-prefix patch' ' + rm -fr .git/rebase-apply && + git reset --hard && + git checkout -b lorem3 master2 && + sed -n -e "3,\$p" msg >file && + head -n 9 msg >>file && + git add file && + test_tick && + git commit -m "copied stuff" && + git am -3 -p0 lorem-zero.patch && + ! test -d .git/rebase-apply && + git diff --exit-code lorem +' + test_expect_success 'am can rename a file' ' grep "^rename from" rename.patch && rm -fr .git/rebase-apply && |