[PATCH] Fix git-rev-parse --default and --flags handling

This makes the argument to --default and any --flags arguments should up
correctly, and makes "--" together with --flags act sanely.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/rev-parse.c b/rev-parse.c
index f1f5163447e98f1afb65137fd7cc9db7ff793b29..9281b45d1f54dda858d7adff14e90f8e94eccc13 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -107,7 +107,7 @@ static void show_arg(char *arg)
        if (do_rev_argument && is_rev_argument(arg))
                show_rev_arg(arg);
        else
-               show_norev(arg);
+               show(arg);
 }
 
 static void show_default(void)
@@ -122,7 +122,7 @@ static void show_default(void)
                        show_rev(NORMAL, sha1, s);
                        return;
                }
-               show_arg(s);
+               show_norev(s);
        }
 }
 
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
                if (*arg == '-') {
                        if (!strcmp(arg, "--")) {
                                show_default();
-                               if (revs_only)
+                               if (revs_only || flags_only)
                                        break;
                                as_is = 1;
                        }