kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Fix git-rev-parse over-eager errors 

Using "--verify" together with "--no-flags" makes perfect sense, but
git-rev-parse would complain about it when it saw a flag, even though it
would never actually use/output that flag.

This fixes it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Linus Torvalds 2006-02-05 11:58:34 -08:00 committed by Junio C Hamano
parent 7334f06ce6
commit 9523a4c2fc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rev-parse.c
View File

@ -107,12 +107,15 @@ static void show_rev(int type, const unsigned char *sha1, const char *name)
} }


/* Output a flag, only if filter allows it. */ /* Output a flag, only if filter allows it. */
static void show_flag(char *arg) static int show_flag(char *arg)
{ {
if (!(filter & DO_FLAGS)) if (!(filter & DO_FLAGS))
return; return 0;
if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) {
show(arg); show(arg);
return 1;
}
return 0;
} }


static void show_default(void) static void show_default(void)
@ -296,9 +299,8 @@ int main(int argc, char **argv)
show_datestring("--min-age=", arg+8); show_datestring("--min-age=", arg+8);
continue; continue;
} }
if (verify) if (show_flag(arg) && verify)
die("Needed a single revision"); die("Needed a single revision");
show_flag(arg);
continue; continue;
} }