diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t7008-filter-branch-null-sha1.sh | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t7008-filter-branch-null-sha1.sh')
-rwxr-xr-x | third_party/git/t/t7008-filter-branch-null-sha1.sh | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/third_party/git/t/t7008-filter-branch-null-sha1.sh b/third_party/git/t/t7008-filter-branch-null-sha1.sh deleted file mode 100755 index 9ba9f24ad2fb..000000000000 --- a/third_party/git/t/t7008-filter-branch-null-sha1.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -test_description='filter-branch removal of trees with null sha1' -. ./test-lib.sh - -test_expect_success 'setup: base commits' ' - test_commit one && - test_commit two && - test_commit three -' - -test_expect_success 'setup: a commit with a bogus null sha1 in the tree' ' - { - git ls-tree HEAD && - printf "160000 commit $ZERO_OID\\tbroken\\n" - } >broken-tree && - echo "add broken entry" >msg && - - tree=$(git mktree <broken-tree) && - test_tick && - commit=$(git commit-tree $tree -p HEAD <msg) && - git update-ref HEAD "$commit" -' - -# we have to make one more commit on top removing the broken -# entry, since otherwise our index does not match HEAD (and filter-branch will -# complain). We could make the index match HEAD, but doing so would involve -# writing a null sha1 into the index. -test_expect_success 'setup: bring HEAD and index in sync' ' - test_tick && - git commit -a -m "back to normal" -' - -test_expect_success 'noop filter-branch complains' ' - test_must_fail git filter-branch \ - --force --prune-empty \ - --index-filter "true" -' - -test_expect_success 'filter commands are still checked' ' - test_must_fail git filter-branch \ - --force --prune-empty \ - --index-filter "git rm --cached --ignore-unmatch three.t" -' - -test_expect_success 'removing the broken entry works' ' - echo three >expect && - git filter-branch \ - --force --prune-empty \ - --index-filter "git rm --cached --ignore-unmatch broken" && - git log -1 --format=%s >actual && - test_cmp expect actual -' - -test_done |