From: Linus Torvalds <torvalds@osdl.org>
Date: Mon, 6 Feb 2006 05:41:47 +0000 (-0800)
Subject: rev-parse lstat() workaround cleanup.
X-Git-Tag: v1.2.0~56^3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9ad0a9333079359cbce8fd2448eb7478786e1150;p=git.git

rev-parse lstat() workaround cleanup.

Earlier we had a workaround to avoid misspelled revision name to
be taken as a filename when "--no-revs --no-flags" are in
effect.  This cleans up the logic.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/rev-parse.c b/rev-parse.c
index 9cec33b8c..b82f294a7 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -150,11 +150,14 @@ static void show_datestring(const char *flag, const char *datestr)
 	show(buffer);
 }
 
-static void show_file(const char *arg)
+static int show_file(const char *arg)
 {
 	show_default();
-	if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
+	if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV)) {
 		show(arg);
+		return 1;
+	}
+	return 0;
 }
 
 int main(int argc, char **argv)
@@ -329,14 +332,13 @@ int main(int argc, char **argv)
 			show_rev(REVERSED, sha1, arg+1);
 			continue;
 		}
+		as_is = 1;
+		if (!show_file(arg))
+			continue;
 		if (verify)
 			die("Needed a single revision");
-		if ((filter & DO_REVS) &&
-		    (filter & DO_NONFLAGS) && /* !def && */
-		    lstat(arg, &st) < 0)
+		if (lstat(arg, &st) < 0)
 			die("'%s': %s", arg, strerror(errno));
-		as_is = 1;
-		show_file(arg);
 	}
 	show_default();
 	if (verify && revs_count != 1)