diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:09:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:09:13 -0800 |
| commit | 832d586a0cb30e6568810709c183ad516a8548a3 (patch) | |
| tree | 06695ed63528cd6d0ac647b2fd4dff56227e1976 /t | |
| parent | Merge branch 'maint' to sync with 1.5.4.4 (diff) | |
| parent | filter-branch: handle "disappearing tree" case correctly in subdir filter (diff) | |
| download | tgif-832d586a0cb30e6568810709c183ad516a8548a3.tar.xz | |
Merge branch 'kb/maint-filter-branch-disappear'
* kb/maint-filter-branch-disappear:
filter-branch: handle "disappearing tree" case correctly in subdir filter
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 868babc4b2..6e14bf1c7f 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -179,4 +179,28 @@ test_expect_success 'Name needing quotes' ' ' +test_expect_success 'Subdirectory filter with disappearing trees' ' + git reset --hard && + git checkout master && + + mkdir foo && + touch foo/bar && + git add foo && + test_tick && + git commit -m "Adding foo" && + + git rm -r foo && + test_tick && + git commit -m "Removing foo" && + + mkdir foo && + touch foo/bar && + git add foo && + test_tick && + git commit -m "Re-adding foo" && + + git filter-branch -f --subdirectory-filter foo && + test $(git rev-list master | wc -l) = 3 +' + test_done |