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
@@ -73,11 +73,11 @@ test_them () {
73
M)
74
type=M
75
commit=$merge
76
- subject=$(git show -s --format="%s" "$merge") ;;
76
+ subject=$(git show -s --format="%s" "$commit") ;;
77
C)
78
type=C
79
commit=$merge
80
- subject=$(git show -s --format="%s" "$merge") ;;
80
+ subject=$(git show -s --format="%s" "$commit") ;;
81
*)
82
type=T
83
commit=$tip
@@ -111,5 +111,7 @@ do
111
done
112
113
git fetch
114
-git rev-list --no-merges $RANGE | test_them
115
-git rev-list --first-parent --parents $RANGE | test_them
114
+(
115
+ git rev-list --no-merges $RANGE
116
+ git rev-list --first-parent --parents $RANGE
117
+) | test_them