diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-01 17:02:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-01 17:02:04 -0800 |
| commit | ce3ca275452cf069eb6451d6f5b0f424a6f046aa (patch) | |
| tree | f731b7b32038ae81e72f20ea65c22f4c1b2f65dd | |
| parent | c639a5548a5d8414b55202592885449f66ee2f33 (diff) | |
| download | git-ce3ca275452cf069eb6451d6f5b0f424a6f046aa.tar.gz git-ce3ca275452cf069eb6451d6f5b0f424a6f046aa.tar.xz | |
git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
9ae2172aed289f2706a0e88288909fa47eddd7e7 used "rmdir -p"
carelessly, causing the more important "git-update-index
--remove" to be skipped.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-merge-one-file.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 739a07292..9a049f426 100755 --- 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 "$4" : '\(.*\)/')" 2>/dev/null || : fi && exec git-update-index --remove -- "$4" ;; |