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/t4039-diff-assume-unchanged.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/t4039-diff-assume-unchanged.sh')
| -rwxr-xr-x | third_party/git/t/t4039-diff-assume-unchanged.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/third_party/git/t/t4039-diff-assume-unchanged.sh b/third_party/git/t/t4039-diff-assume-unchanged.sh index 0eb0314a8b35..53ac44b0f003 100755 --- a/third_party/git/t/t4039-diff-assume-unchanged.sh +++ b/third_party/git/t/t4039-diff-assume-unchanged.sh @@ -12,7 +12,6 @@ test_expect_success 'setup' ' git commit -m zero && echo one > one && echo two > two && - blob=$(git hash-object one) && git add one two && git commit -m onetwo && git update-index --assume-unchanged one && @@ -21,7 +20,7 @@ test_expect_success 'setup' ' ' test_expect_success 'diff-index does not examine assume-unchanged entries' ' - git diff-index HEAD^ -- one | grep -q $blob + git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171 ' test_expect_success 'diff-files does not examine assume-unchanged entries' ' |