git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/3] format-patch: fix dashdash usage

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Nov 28, 2009, 11:40 UTC
Message-ID
<1259408429-5685-2-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1259408429-5685-1-git-send-email-felipe.contreras@gmail.com>
$ git format-patch <committish> -- <path-not-in-working-dir>

Doesn't work otherwise. The current code would complain that the path is not in the working tree and that "--" must be specified, even if the user _did_ specify it. This happens because "--" is removed from the arguments, so we need to pass PARSE_OPT_KEEP_DASHDASH to parse_options to avoid that.

Comments by Junio C Hamano.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 builtin-log.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index 33fa6ea..1766349 100644
--- 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;
-- 
1.6.6.rc0.59.g5117f7.dirty
Previous: Felipe ContrerasNext: Felipe Contreras
Message 2 of 6 in “format-patch: improve pathspec usage”
  1. 0/3 format-patch: improve pathspec usageFelipe Contreras, Nov 28, 2009
  2. 1/3 format-patch: fix dashdash usageFelipe Contreras, Nov 28, 2009
  3. 2/3 format-patch: make full-diff enabled by defaultFelipe Contreras, Nov 28, 2009
  4. Nanako ShiraishiJan 5, 2010
  5. 3/3 format-patch: add test for dashdashFelipe Contreras, Nov 28, 2009
  6. Junio C HamanoNov 28, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.