diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-27 22:22:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-27 22:34:19 -0700 |
| commit | b71ce7f3f13ebd0e212bdda82b012ee36df4f63f (patch) | |
| tree | 770119a6f5ba788a15fd91b3ad29490b94a86e43 /t | |
| parent | 37b78c25476d752953dc541e46fbb6bd5017edf7 (diff) | |
| parent | 28bc30220f30850a10217d61f73e46d8a541e670 (diff) | |
| download | git-b71ce7f3f13ebd0e212bdda82b012ee36df4f63f.tar.gz git-b71ce7f3f13ebd0e212bdda82b012ee36df4f63f.tar.xz | |
Merge 1.5.5.3 in
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 1e8a205e5..e26f72693 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -97,7 +97,7 @@ test_expect_success 'subdirectory filter result looks okay' ' test_must_fail git show sub:subdir ' -test_expect_success 'setup and filter history that requires --full-history' ' +test_expect_success 'more setup' ' git checkout master && mkdir subdir && echo A > subdir/new && @@ -107,16 +107,7 @@ test_expect_success 'setup and filter history that requires --full-history' ' git rm a && test_tick && git commit -m "again subdir on master" && - git merge branch && - git branch sub-master && - git-filter-branch -f --subdirectory-filter subdir sub-master -' - -test_expect_success 'subdirectory filter result looks okay' ' - test 3 = $(git rev-list -1 --parents sub-master | wc -w) && - git show sub-master^:new && - git show sub-master^2:new && - test_must_fail git show sub:subdir + git merge branch ' test_expect_success 'use index-filter to move into a subdirectory' ' |