projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Update the list of diagnostics for git-commit-tree
[git.git]
/
git-merge-one-file-script
diff --git
a/git-merge-one-file-script
b/git-merge-one-file-script
index
88ad3ed
..
9802f67
100755
(executable)
--- a/
git-merge-one-file-script
+++ b/
git-merge-one-file-script
@@
-22,8
+22,11
@@
case "${1:-.}${2:-.}${3:-.}" in
#
"$1.." | "$1.$1" | "$1$1.")
echo "Removing $4"
- rm -f -- "$4" &&
- exec git-update-cache --remove -- "$4"
+ if test -f "$4"
+ then
+ rm -f -- "$4"
+ fi &&
+ exec git-update-cache --remove -- "$4"
;;
#