X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=e956cd5ed54906335f0b07e9b522a869bfddd218;hb=8ac80a5701780547404523a84f4b1ae67bfa6823;hp=70a82714ca061db579838662189049d94453c9e3;hpb=44de0da4f908b6600647673e1236b0ca504a9c15;p=git.git

diff --git a/rev-parse.c b/rev-parse.c
index 70a82714..e956cd5e 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -39,15 +39,15 @@ static int is_rev_argument(const char *arg)
 		"--header",
 		"--max-age=",
 		"--max-count=",
-		"--merge-order",
 		"--min-age=",
 		"--no-merges",
 		"--objects",
+		"--objects-edge",
 		"--parents",
 		"--pretty",
-		"--show-breaks",
 		"--sparse",
 		"--topo-order",
+		"--date-order",
 		"--unpacked",
 		NULL
 	};
@@ -166,13 +166,17 @@ int main(int argc, char **argv)
 	unsigned char sha1[20];
 	const char *prefix = setup_git_directory();
 	
+	git_config(git_default_config);
+
 	for (i = 1; i < argc; i++) {
 		struct stat st;
 		char *arg = argv[i];
 		char *dotdot;
-	
+
 		if (as_is) {
-			show_file(arg);
+			if (show_file(arg) && as_is < 2)
+				if (lstat(arg, &st) < 0)
+					die("'%s': %s", arg, strerror(errno));
 			continue;
 		}
 		if (!strcmp(arg,"-n")) {
@@ -192,7 +196,7 @@ int main(int argc, char **argv)
 
 		if (*arg == '-') {
 			if (!strcmp(arg, "--")) {
-				as_is = 1;
+				as_is = 2;
 				/* Pass on the "--" if we show anything but files.. */
 				if (filter & (DO_FLAGS | DO_REVS))
 					show_file(arg);
@@ -311,16 +315,17 @@ int main(int argc, char **argv)
 		dotdot = strstr(arg, "..");
 		if (dotdot) {
 			unsigned char end[20];
-			char *n = dotdot+2;
+			char *next = dotdot + 2;
+			char *this = arg;
 			*dotdot = 0;
-			if (!get_sha1(arg, sha1)) {
-				if (!*n)
-					n = "HEAD";
-				if (!get_sha1(n, end)) {
-					show_rev(NORMAL, end, n);
-					show_rev(REVERSED, sha1, arg);
-					continue;
-				}
+			if (!*next)
+				next = "HEAD";
+			if (dotdot == arg)
+				this = "HEAD";
+			if (!get_sha1(this, sha1) && !get_sha1(next, end)) {
+				show_rev(NORMAL, end, next);
+				show_rev(REVERSED, sha1, this);
+				continue;
 			}
 			*dotdot = '.';
 		}