diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-05-01 21:09:28 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 21:09:28 -0700 |
| commit | 7fa76eeb75d2062d4e8ba3ac5dab925b0bbac6cd (patch) | |
| tree | c6692b1d47b05eacaedeff8d1f6c4b1a50bfe7e2 /git-apply-patch-script | |
| parent | [PATCH] Add git-local-pull. (diff) | |
| download | tgif-7fa76eeb75d2062d4e8ba3ac5dab925b0bbac6cd.tar.xz | |
[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-script | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/git-apply-patch-script b/git-apply-patch-script index b6387f6646..c28015aad3 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 |