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/t7012-skip-worktree-writing.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/t7012-skip-worktree-writing.sh')
| -rwxr-xr-x | third_party/git/t/t7012-skip-worktree-writing.sh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/third_party/git/t/t7012-skip-worktree-writing.sh b/third_party/git/t/t7012-skip-worktree-writing.sh index 7476781979..9d1abe50ef 100755 --- a/third_party/git/t/t7012-skip-worktree-writing.sh +++ b/third_party/git/t/t7012-skip-worktree-writing.sh @@ -134,21 +134,6 @@ test_expect_success 'git-clean, dirty case' ' test_i18ncmp expected result ' -test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' ' - test_commit keep-me && - git update-index --skip-worktree keep-me.t && - rm keep-me.t && - - : ignoring the worktree && - git update-index --remove --ignore-skip-worktree-entries keep-me.t && - git diff-index --cached --exit-code HEAD && - - : not ignoring the worktree, a deletion is staged && - git update-index --remove keep-me.t && - test_must_fail git diff-index --cached --exit-code HEAD \ - --diff-filter=D -- keep-me.t -' - #TODO test_expect_failure 'git-apply adds file' false #TODO test_expect_failure 'git-apply updates file' false #TODO test_expect_failure 'git-apply removes file' false |