DORMANTno replies

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:41:55

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 <redacted>
---

****************************************************************
Linus, please do not forget to make this script EXECUTABLE this
time.
****************************************************************

jit-diff linus-mirror: git-apply-patch-script
# - Fix missing '\n' at end of git-cat-file -t output.
# + working-tree
Mode changed: git-apply-patch-script (100644->100755)
--- k/git-apply-patch-script
+++ l/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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help