X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=5a989825113b122d130448726c8eb97ffeb21ad1;hb=ad4f4daae80cb00000aca76e1528add6daf8f033;hp=507b531dce781133946da04cb27fa2ff6d3832a9;hpb=c1babb1d65e034a058c14379eabec8eb374757ca;p=git.git

diff --git a/rev-parse.c b/rev-parse.c
index 507b531d..5a989825 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -32,7 +32,9 @@ static int revs_count = 0;
 static int is_rev_argument(const char *arg)
 {
 	static const char *rev_args[] = {
+		"--all",
 		"--bisect",
+		"--dense",
 		"--header",
 		"--max-age=",
 		"--max-count=",
@@ -43,6 +45,7 @@ static int is_rev_argument(const char *arg)
 		"--parents",
 		"--pretty",
 		"--show-breaks",
+		"--sparse",
 		"--topo-order",
 		"--unpacked",
 		NULL
@@ -150,6 +153,13 @@ static void show_datestring(const char *flag, const char *datestr)
 	show(buffer);
 }
 
+static void show_file(const char *arg)
+{
+	show_default();
+	if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
+		show(arg);
+}
+
 int main(int argc, char **argv)
 {
 	int i, as_is = 0, verify = 0;
@@ -161,12 +171,15 @@ int main(int argc, char **argv)
 		char *dotdot;
 	
 		if (as_is) {
-			show(arg);
+			show_file(arg);
 			continue;
 		}
 		if (*arg == '-') {
 			if (!strcmp(arg, "--")) {
 				as_is = 1;
+				/* Pass on the "--" if we show anything but files.. */
+				if (filter & (DO_FLAGS | DO_REVS))
+					show_file(arg);
 				continue;
 			}
 			if (!strcmp(arg, "--default")) {
@@ -281,9 +294,8 @@ int main(int argc, char **argv)
 		}
 		if (verify)
 			die("Needed a single revision");
-		if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
-		    (DO_NONFLAGS|DO_NOREV))
-			show(arg);
+		as_is = 1;
+		show_file(arg);
 	}
 	show_default();
 	if (verify && revs_count != 1)