From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Jan 2013 20:56:39 +0000 (-0800)
Subject: Meta/Reintegrate: omit cut mark if no topics were merged from the group
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98b350d958a002b4124b17e4896b4ed048b8e9d0;p=thirdparty%2Fgit.git

Meta/Reintegrate: omit cut mark if no topics were merged from the group
---

diff --git a/Reintegrate b/Reintegrate
index 1fad661b6c..da69ce5a02 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -84,12 +84,15 @@ no)
 	}
 
 	mark_cut () {
+		test -n "$stop_at_cut" && return
+
+		count_since_last_cut=$(( $count_since_last_cut + 1 ))
 		test -z "$prev_cut" && return
 		git commit --allow-empty -m "$prev_cut"
 		prev_cut=
 	}
 
-	cut_seen=0 prev_cut=
+	cut_seen=0 prev_cut= count_since_last_cut=0
 	while read branch eh
 	do
 		case "$branch" in '###') cut_seen=$(( $cut_seen + 1 )) ;; esac
@@ -100,8 +103,14 @@ no)
 
 		case "$branch" in
 		'###')
-			echo >&2 "$branch $eh"
-			prev_cut="$branch $eh"
+			if test "$count_since_last_cut" = 0
+			then
+				prev_cut=
+			else
+				echo >&2 "$branch $eh"
+				prev_cut="$branch $eh"
+				count_since_last_cut=0
+			fi
 			continue ;;
 		'#'* | '')
 			continue ;;