Merge branch 'fc/maint-format-patch-pathspec-dashes'

Conflicts: t/t4014-format-patch.sh
2009-11-30 14:46:09 -08:00
parent 045c050485 7e93d3b9e5
commit 9eba92f684
2 changed files with 7 additions and 1 deletions
--- a/builtin-log.c
+++ b/builtin-log.c
@ -976,7 +976,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;