Meta/cycle-run: draw a plan just once for both merges and individual commits
Junio C Hamano committed
Mar 23, 2021 at 22:24 UTC
a887ac9001fb85230c005bd696d0dc5ef5d3903e
1 file changed
+6
-4
cycle-run
+6
-4
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