projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
refs.c: convert it to use lockfile interface.
[git.git]
/
git-merge-one-file.sh
diff --git
a/git-merge-one-file.sh
b/git-merge-one-file.sh
index
5349a1c
..
5619409
100755
(executable)
--- a/
git-merge-one-file.sh
+++ b/
git-merge-one-file.sh
@@
-26,7
+26,7
@@
case "${1:-.}${2:-.}${3:-.}" in
fi
if test -f "$4"; then
rm -f -- "$4" &&
- rmdir -p "$(expr "
$4" : '
\(.*\)/')" 2>/dev/null || :
+ rmdir -p "$(expr "
z$4" : 'z
\(.*\)/')" 2>/dev/null || :
fi &&
exec git-update-index --remove -- "$4"
;;