Reintegrate: show cut lines
Junio C Hamano committed
Nov 20, 2025 at 14:20 UTC
4cc73a7b1e1742cdec2e3d9463d91c87a6d26241
1 file changed
+6
-2
Reintegrate
+6
-2
index 762ea76c0c..a1e67a0330 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -194,7 +194,12 @@ no)
while read branch eh
do
- case "$branch" in '###') cut_seen=$(( $cut_seen + 1 )) ;; esac
+ case "$branch" in
+ '###')
+ cut_seen=$(( $cut_seen + 1 ))
+ echo >&2 "$branch $eh"
+ ;;
+ esac
if test -n "$stop_at_cut" && test $stop_at_cut -le $cut_seen
then
continue ;# slurp the remainder and skip
@@ -206,7 +211,6 @@ no)
then
prev_cut=
else
- echo >&2 "$branch $eh"
prev_cut="$branch $eh"
count_since_last_cut=0
fi