diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:47:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:47:13 -0700 |
| commit | 01914577ed42498d9e268684949d699e0272e964 (patch) | |
| tree | a0405b854b76eeb5b90b7f13ebd3607a655fb2cf /t/t7003-filter-branch.sh | |
| parent | 53b543ab8218cede7fb9383298c00dcef663692c (diff) | |
| parent | e910ce30e41ae4ddc20a64661e8cf2702433e5db (diff) | |
| download | git-01914577ed42498d9e268684949d699e0272e964.tar.gz git-01914577ed42498d9e268684949d699e0272e964.tar.xz | |
Merge branch 'tr/filter-branch'
* tr/filter-branch:
revision --simplify-merges: make it a no-op without pathspec
revision --simplify-merges: do not leave commits unprocessed
revision --simplify-merges: use decoration instead of commit->util field
Documentation: rev-list-options: move --simplify-merges documentation
filter-branch: use --simplify-merges
filter-branch: fix ref rewriting with --subdirectory-filter
filter-branch: Extend test to show rewriting bug
Topo-sort before --simplify-merges
revision traversal: show full history with merge simplification
revision.c: whitespace fix
Diffstat (limited to 't/t7003-filter-branch.sh')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index f92d414e6..95f13a8b2 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -96,13 +96,17 @@ test_expect_success 'filter subdirectory only' ' test_tick && git commit -m "again not subdir" && git branch sub && - git-filter-branch -f --subdirectory-filter subdir refs/heads/sub + git branch sub-earlier HEAD~2 && + git-filter-branch -f --subdirectory-filter subdir \ + refs/heads/sub refs/heads/sub-earlier ' test_expect_success 'subdirectory filter result looks okay' ' test 2 = $(git rev-list sub | wc -l) && git show sub:new && - test_must_fail git show sub:subdir + test_must_fail git show sub:subdir && + git show sub-earlier:new && + test_must_fail git show sub-earlier:subdir ' test_expect_success 'more setup' ' |