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>
Junio C Hamano committed
Nov 20, 2005 at 10:40 UTC
9ae2172aed289f2706a0e88288909fa47eddd7e7
1 file changed
+1
-5
git-merge-one-file.sh
+1
-5
@@ -26,11 +26,7 @@ case "${1:-.}${2:-.}${3:-.}" in
26
fi
27
if test -f "$4"; then
28
rm -f -- "$4" &&
29
- dn="$4" &&
30
- while dn=$(expr "$dn" : '\(.*\)/') && rmdir "$dn" 2>/dev/null
31
- do
32
- :;
33
- done
29
+ rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null
30
fi &&
31
exec git-update-index --remove -- "$4"
32
;;