diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-04 23:35:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-04 23:35:12 -0800 |
| commit | 250f0a074a0bf7194c6a99c481211b0c9d8590a7 (patch) | |
| tree | a7713bccac0041d6409dee8d7bc95527dff77dab /t/t4150-am.sh | |
| parent | 91527e54d565e6fb6910fb3cb22f5915b5bd346e (diff) | |
| parent | a61ba26a4725d4a93297305315587b92324baf0b (diff) | |
| download | git-250f0a074a0bf7194c6a99c481211b0c9d8590a7.tar.gz git-250f0a074a0bf7194c6a99c481211b0c9d8590a7.tar.xz | |
Merge branch 'jc/am-3-nonstandard-popt'
* jc/am-3-nonstandard-popt:
test: "am -3" can accept non-standard -p<num>
am -3: allow nonstandard -p<num> option
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 6f77fffee..ccc0280f5 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 && |