OSDN Git Service

rev-parse: fix --verify to error out when passed junk after a good rev
authorChristian Couder <chriscool@tuxfamily.org>
Sat, 26 Apr 2008 13:19:29 +0000 (15:19 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Apr 2008 20:19:46 +0000 (13:19 -0700)
Before this patch something like:

$ git rev-parse --verify <good-rev> <junk>

worked whatever junk was as long as <good-rev> could be parsed
correctly.

This patch makes "git rev-parse --verify" error out when passed
any junk after a good rev.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-rev-parse.c

index 9384a99..0e59707 100644 (file)
@@ -576,11 +576,11 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
                        show_rev(REVERSED, sha1, arg+1);
                        continue;
                }
+               if (verify)
+                       die_no_single_rev(quiet);
                as_is = 1;
                if (!show_file(arg))
                        continue;
-               if (verify)
-                       die_no_single_rev(quiet);
                verify_filename(prefix, arg);
        }
        show_default();