merge(3p/git): Merge git upstream at v2.26.2

2020-05-22 17:46:45 +01:00 · 2020-05-22 17:46:45 +01:00 · 5229c9b232
commit 5229c9b232
parent f2b211131f 8518a7a51f
1006 changed files with 149006 additions and 60819 deletions
--- a/third_party/git/t/t7505-prepare-commit-msg-hook.sh
+++ b/third_party/git/t/t7505-prepare-commit-msg-hook.sh
@ -241,13 +241,7 @@ test_rebase () {
 			git add b &&
 			git rebase --continue
 		) &&
-		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 &&
+		git log --pretty=%s -g -n18 HEAD@{1} >actual &&
 		test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual
 	'
 }