From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Mar 2021 05:24:31 +0000 (-0700)
Subject: Meta/cycle-run: draw a plan just once for both merges and individual commits
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a887ac9001fb85230c005bd696d0dc5ef5d3903e;p=thirdparty%2Fgit.git

Meta/cycle-run: draw a plan just once for both merges and individual commits
---

diff --git a/cycle-run b/cycle-run
index 5401de565a..e2675b0df0 100755
--- a/cycle-run
+++ b/cycle-run
@@ -73,11 +73,11 @@ test_them () {
 		M)
 			type=M
 			commit=$merge
-			subject=$(git show -s --format="%s" "$merge") ;;
+			subject=$(git show -s --format="%s" "$commit") ;;
 		C)
 			type=C
 			commit=$merge
-			subject=$(git show -s --format="%s" "$merge") ;;
+			subject=$(git show -s --format="%s" "$commit") ;;
 		*)
 			type=T
 			commit=$tip
@@ -111,5 +111,7 @@ do
 done
 
 git fetch
-git rev-list --no-merges $RANGE | test_them
-git rev-list --first-parent --parents $RANGE | test_them
+(
+	git rev-list --no-merges $RANGE
+	git rev-list --first-parent --parents $RANGE
+) | test_them