[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 b6387f66464fba58353b3fef423eeca327f570a7..c28015aad3bbe9ec18c031c1ef8f1f3c3c388378 100644 (file)
--- 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