projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of .
[git.git]
/
git-merge-one-file-script
diff --git
a/git-merge-one-file-script
b/git-merge-one-file-script
index
9802f67
..
b791107
100755
(executable)
--- a/
git-merge-one-file-script
+++ b/
git-merge-one-file-script
@@
-21,12
+21,13
@@
case "${1:-.}${2:-.}${3:-.}" in
# Deleted in both or deleted in one and unchanged in the other
#
"$1.." | "$1.$1" | "$1$1.")
# Deleted in both or deleted in one and unchanged in the other
#
"$1.." | "$1.$1" | "$1$1.")
- echo "Removing $4"
- if test -f "$4"
- then
+ if [ "$2" ]; then
+ echo "Removing $4"
+ fi
+ if test -f "$4"; then
rm -f -- "$4"
fi &&
rm -f -- "$4"
fi &&
- exec git-update-cache --remove -- "$4"
+
exec git-update-cache --remove -- "$4"
;;
#
;;
#
@@
-62,7
+63,7
@@
case "${1:-.}${2:-.}${3:-.}" in
# We reset the index to the first branch, making
# git-diff-file useful
# We reset the index to the first branch, making
# git-diff-file useful
- git-update-cache --add --cacheinfo "$6" "$2" "$4"
+ git-update-cache --add --cacheinfo "$6" "$2" "$4"
git-checkout-cache -u -f -- "$4" &&
merge "$4" "$orig" "$src2"
ret=$?
git-checkout-cache -u -f -- "$4" &&
merge "$4" "$orig" "$src2"
ret=$?