X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=169d0cc9b5a5769ad90e1f76039f14bf051a39dc;hb=c4c86f07d01bc4a05126b129f644e70dd9e244d0;hp=85230dfaa9d943938bffa0266490fd6956ee7a4f;hpb=7a3dd472ad2c69b7450a59eb2a35efb0698993d0;p=git.git

diff --git a/rev-parse.c b/rev-parse.c
index 85230dfa..169d0cc9 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -153,6 +153,7 @@ static void show_datestring(const char *flag, const char *datestr)
 
 static void show_file(const char *arg)
 {
+	show_default();
 	if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
 		show(arg);
 }
@@ -174,6 +175,9 @@ int main(int argc, char **argv)
 		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")) {
@@ -288,6 +292,7 @@ int main(int argc, char **argv)
 		}
 		if (verify)
 			die("Needed a single revision");
+		as_is = 1;
 		show_file(arg);
 	}
 	show_default();