From: Linus Torvalds <torvalds@osdl.org>
Date: Tue, 23 Aug 2005 17:47:54 +0000 (-0700)
Subject: [PATCH] Fix git-rev-parse --default and --flags handling
X-Git-Tag: v0.99.5~4^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0360e99d06acfbb0fcb72215cf6749591ee53290;p=git.git

[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 f1f516344..9281b45d1 100644
--- 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;
 			}