From: Pierre Habouzit Date: Thu, 31 Jul 2008 10:22:23 +0000 (+0200) Subject: Allow "non-option" revision options in parse_option-enabled commands X-Git-Tag: v1.6.0-rc2~42 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fe8c1381043ef64fce1b8372df19046a4b1518e;p=git.git Allow "non-option" revision options in parse_option-enabled commands 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 Acked-By: Pierre Habouzit Signed-off-by: Junio C Hamano --- diff --git a/revision.c b/revision.c index 3897fec53..e75079a6e 100644 --- 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=")) {