Fix git-rev-parse over-eager errors
From: Linus Torvalds <torvalds@osdl.org>
Date: 2016-06-15 22:42:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: Fix git-rev-parse over-eager errors · Junio C Hamano <hidden>
- 2016-06-15 · Re: Fix git-rev-parse over-eager errors · Linus Torvalds <torvalds@osdl.org>
- 2016-06-15 · Re: Fix git-rev-parse over-eager errors · Junio C Hamano <hidden>
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> --- This is independent of the "git show" patches, although the problem was triggered by the "git show" usage of git-rev-parse. It's a bug whether git show is merged or not, though.
diff --git a/rev-parse.c b/rev-parse.c
index 6bf205a..9cec33b 100644
--- a/rev-parse.c
+++ b/rev-parse.c@@ -107,12 +107,15 @@ static void show_rev(int type, const uns } /* Output a flag, only if filter allows it. */ -static void show_flag(char *arg) +static int show_flag(char *arg) { if (!(filter & DO_FLAGS)) - return; - if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) + return 0; + if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) { show(arg); + return 1; + } + return 0; } static void show_default(void)
@@ -296,9 +299,8 @@ int main(int argc, char **argv) show_datestring("--min-age=", arg+8); continue; } - if (verify) + if (show_flag(arg) && verify) die("Needed a single revision"); - show_flag(arg); continue; }