diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-07 14:53:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 14:53:50 -0800 |
| commit | cb16bcc36965f28845e4fae15c36280a2506f1be (patch) | |
| tree | a1acd0c9c1b89d30749f4414d727064f1c416fd5 | |
| parent | 11a1a49a16a52ff9b684a430d68b8982ed313427 (diff) | |
| parent | 3fc0d131c573f6f774e2e4abba9cbda694b08321 (diff) | |
| download | git-cb16bcc36965f28845e4fae15c36280a2506f1be.tar.gz git-cb16bcc36965f28845e4fae15c36280a2506f1be.tar.xz | |
Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
* jk/maint-rmdir-fix:
rm: fix bug in recursive subdirectory removal
| -rw-r--r-- | dir.c | 2 | ||||
| -rwxr-xr-x | t/t3600-rm.sh | 8 |
2 files changed, 9 insertions, 1 deletions
@@ -933,7 +933,7 @@ int remove_path(const char *name) slash = dirs + (slash - name); do { *slash = '\0'; - } while (rmdir(dirs) && (slash = strrchr(dirs, '/'))); + } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/'))); free(dirs); } return 0; diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 76b1bb454..0aaf0ad84 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -271,4 +271,12 @@ test_expect_success 'choking "git rm" should not let it die with cruft' ' test "$status" != 0 ' +test_expect_success 'rm removes subdirectories recursively' ' + mkdir -p dir/subdir/subsubdir && + echo content >dir/subdir/subsubdir/file && + git add dir/subdir/subsubdir/file && + git rm -f dir/subdir/subsubdir/file && + ! test -d dir +' + test_done |