about summary refs log tree commit diff
path: root/third_party/git/t/t1414-reflog-walk.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t1414-reflog-walk.sh
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (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/t1414-reflog-walk.sh')
-rwxr-xr-xthird_party/git/t/t1414-reflog-walk.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/git/t/t1414-reflog-walk.sh b/third_party/git/t/t1414-reflog-walk.sh
index 1181a9fb28e3..feb1efd8ff99 100755
--- a/third_party/git/t/t1414-reflog-walk.sh
+++ b/third_party/git/t/t1414-reflog-walk.sh
@@ -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