diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 23:46:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 23:46:09 +0100 |
| commit | 9eba92f684ad9fb1b2e9b99f3f406048fece266d (patch) | |
| tree | 2d611269e5e0441d3e23c37fb0b8fa9a41ea5aea /t | |
| parent | Merge branch 'mm/maint-merge-ff-error-message-fix' (diff) | |
| parent | format-patch: add test for parsing of "--" (diff) | |
| download | git-9eba92f684ad9fb1b2e9b99f3f406048fece266d.tar.xz git-9eba92f684ad9fb1b2e9b99f3f406048fece266d.zip | |
Merge branch 'fc/maint-format-patch-pathspec-dashes'
Conflicts:
t/t4014-format-patch.sh
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 7f267f9ed1..3bc1cccf88 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -552,4 +552,9 @@ test_expect_success 'format-patch --numstat should produce a patch' ' git format-patch --numstat --stdout master..side > output && test 6 = $(grep "^diff --git a/" output | wc -l)' +test_expect_success 'format-patch -- <path>' ' + git format-patch master..side -- file 2>error && + ! grep "Use .--" error +' + test_done |