Allow "non-option" revision options in parse_option-enabled commands

MadCoder · gitster · commit 0fe8c1381043 · 2008-07-31T11:35:17.000-07:00
Commands which use parse_options() but also call setup_revisions()
must do their parsing in a two step process:

  1. first, they parse all options. Anything unknown goes to
     parse_revision_opt() (which calls handle_revision_opt), which
     may claim the option or say "I don't recognize this"

  2. the non-option remainder goes to setup_revisions() to
     actually get turned into revisions

Some revision options are "non-options" in that they must be
parsed in order with their revision counterparts in
setup_revisions().  For example, "--all" functions as a
pseudo-option expanding to all refs, and "--no-walk" affects refs
after it on the command line, but not before. The revision option
parser in step 1 recognizes such options and sets them aside for
later parsing by setup_revisions().

However, the return value used from handle_revision_opt indicated
"I didn't recognize this", which was wrong. It did, and it took
appropriate action (even though that action was just deferring it
for later parsing). Thus it should return "yes, I recognized
this."

Previously, these pseudo-options generated an error when used with
parse_options parsers (currently just blame and shortlog). With
this patch, they should work fine, enabling things like "git
shortlog --all".

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Acked-By: Pierre Habouzit &lt;madcoder@debian.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/revision.c b/revision.c
@@ -1002,7 +1002,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 	    !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk"))
 	{
 		unkv[(*unkc)++] = arg;
-		return 0;
+		return 1;
 	}
 
 	if (!prefixcmp(arg, "--max-count=")) {

Original file line number	Diff line number	Diff line change
`@@ -1002,7 +1002,7 @@ static int handle_revision_opt(struct rev_info revs, int argc, const char *arg`
`1002`	`1002`	`!strcmp(arg, "--no-walk") \|\| !strcmp(arg, "--do-walk"))`
`1003`	`1003`	`{`
`1004`	`1004`	`unkv[(*unkc)++] = arg;`
`1005`		`- return 0;`
	`1005`	`+ return 1;`
`1006`	`1006`	`}`
`1007`	`1007`
`1008`	`1008`	`if (!prefixcmp(arg, "--max-count=")) {`