summaryrefslogtreecommitdiff
path: root/git-apply-patch-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-02 04:09:28 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-02 04:09:28 (GMT)
commit7fa76eeb75d2062d4e8ba3ac5dab925b0bbac6cd (patch)
treec6692b1d47b05eacaedeff8d1f6c4b1a50bfe7e2 /git-apply-patch-script
parentdfcb405799fa620028e492299a60438a7b4a35ff (diff)
downloadgit-7fa76eeb75d2062d4e8ba3ac5dab925b0bbac6cd.zip
git-7fa76eeb75d2062d4e8ba3ac5dab925b0bbac6cd.tar.gz
git-7fa76eeb75d2062d4e8ba3ac5dab925b0bbac6cd.tar.bz2
[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>
Diffstat (limited to 'git-apply-patch-script')
-rw-r--r--git-apply-patch-script6
1 files changed, 2 insertions, 4 deletions
diff --git a/git-apply-patch-script b/git-apply-patch-script
index b6387f6..c28015a 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