summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-02-19 01:31:42 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-19 01:31:42 -0800
commit50c19c777d7b219914b4149e9a465542e3cb5700 (patch)
tree8f324bd06f6c515dd28888a2e619917e3bcc2513 /t
parentMerge branch 'maint' (diff)
parentMerge branch 'jk/maint-rmdir-fix' into maint (diff)
downloadtgif-50c19c777d7b219914b4149e9a465542e3cb5700.tar.xz
Merge branch 'maint'
* maint: rm: fix bug in recursive subdirectory removal Documentation: describe --thin more accurately
Diffstat (limited to 't')
-rwxr-xr-xt/t3600-rm.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 76b1bb4545..0aaf0ad84b 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