mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
merge-one-file: use rmdir -p
The flag is universally available, even on VMS; use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
@@ -26,11 +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" &&
|
||||||
dn="$4" &&
|
rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null
|
||||||
while dn=$(expr "$dn" : '\(.*\)/') && rmdir "$dn" 2>/dev/null
|
|
||||||
do
|
|
||||||
:;
|
|
||||||
done
|
|
||||||
fi &&
|
fi &&
|
||||||
exec git-update-index --remove -- "$4"
|
exec git-update-index --remove -- "$4"
|
||||||
;;
|
;;
|
||||||
|
|||||||
Reference in New Issue
Block a user