summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 13:54:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 13:54:25 -0800
commitc8b1d761f61c4be0b036620ba418ff0e97979fde (patch)
tree45bb20243c75d8fbc3a39c3bf401f9e6f53ec0b3
parentMerge branch 'ap/maint-merge-strategy-list-fix' into maint (diff)
parentformat-patch: add test for parsing of "--" (diff)
downloadtgif-c8b1d761f61c4be0b036620ba418ff0e97979fde.tar.xz
Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint
* fc/maint-format-patch-pathspec-dashes: format-patch: add test for parsing of "--" format-patch: fix parsing of "--" on the command line
-rw-r--r--builtin-log.c3
-rwxr-xr-xt/t4014-format-patch.sh5
2 files changed, 7 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 7b91c91423..0cf978e094 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -969,7 +969,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
*/
argc = parse_options(argc, argv, prefix, builtin_format_patch_options,
builtin_format_patch_usage,
- PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN);
+ PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
+ PARSE_OPT_KEEP_DASHDASH);
if (do_signoff) {
const char *committer;
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index cab6ce2e97..74e5b63bbf 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -536,4 +536,9 @@ test_expect_success 'format-patch --signoff' '
grep "^Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
'
+test_expect_success 'format-patch -- <path>' '
+ git format-patch master..side -- file 2>error &&
+ ! grep "Use .--" error
+'
+
test_done