about summary refs log tree commit diff
path: root/third_party/git/t/t7505-prepare-commit-msg-hook.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/t7505-prepare-commit-msg-hook.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/t7505-prepare-commit-msg-hook.sh')
-rwxr-xr-xthird_party/git/t/t7505-prepare-commit-msg-hook.sh8
1 files changed, 7 insertions, 1 deletions
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
 	'
 }