diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:54:25 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:54:25 +0300 |
| commit | c8b1d761f61c4be0b036620ba418ff0e97979fde (patch) | |
| tree | 45bb20243c75d8fbc3a39c3bf401f9e6f53ec0b3 | |
| parent | 99292c638a5c011ce453c904357185d9f6c7dd62 (diff) | |
| parent | 7e93d3b9e58a359a1073460e8f2cb3fef0368bd7 (diff) | |
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.c | 3 | ||||
| -rwxr-xr-x | t/t4014-format-patch.sh | 5 |
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 |