From: Junio C Hamano <junkio@cox.net>
Date: Mon, 2 May 2005 04:09:28 +0000 (-0700)
Subject: [PATCH] typo fixes to git-apply-patch-script
X-Git-Tag: v0.99~663
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7fa76eeb75d2062d4e8ba3ac5dab925b0bbac6cd;p=git.git

[PATCH] typo fixes to git-apply-patch-script

When git-apply-patch-script creates a new file without
executable mode set, a typo caused it not to report that
activity to the user.  Also it was mistakenly running
git-update-cache twice for newly created or deleted paths.  This
patch fixes these problems.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/git-apply-patch-script b/git-apply-patch-script
index b6387f66..c28015aa 100644
--- a/git-apply-patch-script
+++ b/git-apply-patch-script
@@ -31,7 +31,7 @@ test -f "$name.rej" || {
 	    echo >&2 "created $name with mode +x."
 	    chmod "$mode2" "$name"
 	    ;;
-	-)
+	-x)
 	    echo >&2 "created $name."
 	    ;;
 	esac
@@ -52,9 +52,7 @@ test -f "$name.rej" || {
 	    chmod "$mode2" "$name"
 	    ;;
 	esac
+	git-update-cache -- "$name"
     esac
-    # This bit is debatable---the SCM may not want to keep
-    # cache in sync with the work tree (JIT does want to).
-    git-update-cache -- "$name"
 }
 exit 0