revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232
, reversing changes made tof2b211131f
.
This commit is contained in:
parent
6f8fbf4aa4
commit
93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
3
third_party/git/t/t1414-reflog-walk.sh
vendored
3
third_party/git/t/t1414-reflog-walk.sh
vendored
|
@ -18,9 +18,10 @@ do_walk () {
|
|||
git log -g --format="%gd %gs" "$@"
|
||||
}
|
||||
|
||||
sq="'"
|
||||
test_expect_success 'set up expected reflog' '
|
||||
cat >expect.all <<-EOF
|
||||
HEAD@{0} commit (merge): Merge branch ${SQ}master${SQ} into side
|
||||
HEAD@{0} commit (merge): Merge branch ${sq}master${sq} into side
|
||||
HEAD@{1} commit: three
|
||||
HEAD@{2} checkout: moving from master to side
|
||||
HEAD@{3} commit: two
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue