Reintegrate: show cut lines
Junio C Hamano committed
Nov 20, 2025 at 14:20 UTC
4cc73a7b1e1742cdec2e3d9463d91c87a6d26241
1 file changed
+6
-2
Reintegrate
+6
-2
@@ -194,7 +194,12 @@ no)
194
195
while read branch eh
196
do
197
- case "$branch" in '###') cut_seen=$(( $cut_seen + 1 )) ;; esac
197
+ case "$branch" in
198
+ '###')
199
+ cut_seen=$(( $cut_seen + 1 ))
200
+ echo >&2 "$branch $eh"
201
+ ;;
202
+ esac
203
if test -n "$stop_at_cut" && test $stop_at_cut -le $cut_seen
204
then
205
continue ;# slurp the remainder and skip
@@ -206,7 +211,6 @@ no)
211
then
212
prev_cut=
213
else
209
- echo >&2 "$branch $eh"
214
prev_cut="$branch $eh"
215
count_since_last_cut=0
216
fi