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/t3206 | |
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/t3206')
-rw-r--r-- | third_party/git/t/t3206/history.export | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/third_party/git/t/t3206/history.export b/third_party/git/t/t3206/history.export index 4c808e5b3b8d..7bb381496227 100644 --- a/third_party/git/t/t3206/history.export +++ b/third_party/git/t/t3206/history.export @@ -55,7 +55,7 @@ A 19 20 -commit refs/heads/mode-only-change +commit refs/heads/topic mark :4 author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200 committer Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200 @@ -678,32 +678,3 @@ s/12/B/ from :55 M 100644 :9 renamed-file -commit refs/heads/mode-only-change -mark :57 -author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200 -committer Thomas Gummerer <t.gummerer@gmail.com> 1570473767 +0100 -data 24 -s/4/A/ + add other-file -from :4 -M 100644 :5 file -M 100644 :49 other-file - -commit refs/heads/mode-only-change -mark :58 -author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200 -committer Thomas Gummerer <t.gummerer@gmail.com> 1570473768 +0100 -data 33 -s/11/B/ + mode change other-file -from :57 -M 100644 :7 file -M 100755 :49 other-file - -commit refs/heads/mode-only-change -mark :59 -author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200 -committer Thomas Gummerer <t.gummerer@gmail.com> 1570473768 +0100 -data 8 -s/12/B/ -from :58 -M 100644 :9 file - |