undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge-one-file: do not worry about 'rmdir -p' not removing directory.

Browse Source 
9ae2172aed used "rmdir -p"
carelessly, causing the more important "git-update-index
--remove" to be skipped.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-12-01 17:02:04 -08:00
parent c639a5548a
commit ce3ca27545
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-one-file.sh
View File

@ -26,7 +26,7 @@ case "${1:-.}${2:-.}${3:-.}" in
fi fi
if test -f "$4"; then if test -f "$4"; then
rm -f -- "$4" && rm -f -- "$4" &&
rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null || :
fi && fi &&
exec git-update-index --remove -- "$4" exec git-update-index --remove -- "$4"
;; ;;