diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-03-23 00:00:25 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-23 00:00:25 +0300 |
commit | d4bda9b0451fcc7f3fd485be2048cb731f7072ce (patch) | |
tree | 0a2665fa38ec9ba829dc3fc8eaeff729a6e033a2 /t/t7003-filter-branch.sh | |
parent | 20adca90064fe4e8b5fcff312e74ff2e1a407bd2 (diff) | |
parent | 42efa1231aee85932058cc6d1571ab4ceb3e7eff (diff) |
Merge branch 'jk/filter-branch-sha256'
Code clean-up.
* jk/filter-branch-sha256:
filter-branch: drop $_x40 glob
filter-branch: drop multiple-ancestor warning
t7003: test ref rewriting explicitly
Diffstat (limited to 't/t7003-filter-branch.sh')
-rwxr-xr-x | t/t7003-filter-branch.sh | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 1c55695034..1349e5b232 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -506,4 +506,35 @@ test_expect_success 'rewrite repository including refs that point at non-commit ! fgrep fatal filter-output ' +test_expect_success 'filter-branch handles ref deletion' ' + git switch --orphan empty-commit && + git commit --allow-empty -m "empty commit" && + git tag empty && + git branch to-delete && + git filter-branch -f --prune-empty to-delete >out 2>&1 && + grep "to-delete.*was deleted" out && + test_must_fail git rev-parse --verify to-delete +' + +test_expect_success 'filter-branch handles ref rewrite' ' + git checkout empty && + test_commit to-drop && + git branch rewrite && + git filter-branch -f \ + --index-filter "git rm --ignore-unmatch --cached to-drop.t" \ + rewrite >out 2>&1 && + grep "rewrite.*was rewritten" out && + ! grep -i warning out && + git diff-tree empty rewrite +' + +test_expect_success 'filter-branch handles ancestor rewrite' ' + test_commit to-exclude && + git branch ancestor && + git filter-branch -f ancestor -- :^to-exclude.t >out 2>&1 && + grep "ancestor.*was rewritten" out && + ! grep -i warning out && + git diff-tree HEAD^ ancestor +' + test_done |