diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-25 16:35:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-25 16:35:20 -0800 |
| commit | 93dcab2937624ebb97f91807576cddb242a55a46 (patch) | |
| tree | 8d16464f16866a7f215401a95f8bdaa124799d49 /git-merge-one-file.sh | |
| parent | Merge branch 'master' (diff) | |
| parent | git-sh-setup: move the repository check to a core program. (diff) | |
| download | git-0.99.9k.tar.gz git-0.99.9k.zip | |
GIT 0.99.9kv0.99.9k
This is not 1.0rc4 yet, but to push the recent fixes out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index b08597de29..c3eca8b332 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -25,7 +25,8 @@ case "${1:-.}${2:-.}${3:-.}" in echo "Removing $4" fi if test -f "$4"; then - rm -f -- "$4" + rm -f -- "$4" && + rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null fi && exec git-update-index --remove -- "$4" ;; |