From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/t/t7505-prepare-commit-msg-hook.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'third_party/git/t/t7505-prepare-commit-msg-hook.sh') diff --git a/third_party/git/t/t7505-prepare-commit-msg-hook.sh b/third_party/git/t/t7505-prepare-commit-msg-hook.sh index 94f85cdf8317..ba8bd1b51497 100755 --- a/third_party/git/t/t7505-prepare-commit-msg-hook.sh +++ b/third_party/git/t/t7505-prepare-commit-msg-hook.sh @@ -241,7 +241,13 @@ test_rebase () { git add b && git rebase --continue ) && - git log --pretty=%s -g -n18 HEAD@{1} >actual && + if test "$mode" = -p # reword amended after pick + then + n=18 + else + n=17 + fi && + git log --pretty=%s -g -n$n HEAD@{1} >actual && test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual ' } -- cgit 1.4.1