]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Reintegrate: show cut lines
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Nov 2025 22:20:25 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Nov 2025 22:20:25 +0000 (14:20 -0800)
Reintegrate

index 762ea76c0c4aaa7362ecd0a6a7414c5346ce7fc3..a1e67a033048d12fb8b10139bc294b11fda29544 100755 (executable)
@@ -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