From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Aug 2009 22:15:11 +0000 (-0700)
Subject: Fix section detection in cook.sh
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ddf0cc19f00163b3eb7a4b628f7660170b1a86;p=thirdparty%2Fgit.git

Fix section detection in cook.sh
---

diff --git a/cook.sh b/cook.sh
index 563cac9c59..c6775b56e1 100755
--- a/cook.sh
+++ b/cook.sh
@@ -107,6 +107,22 @@ add_desc () {
 	description="$description $kind $others"
 }
 
+show_topic () {
+	old=$1 new=$2
+
+	sed -n -e '/^ ..*/p' "$old" >"$tmp.old.nc"
+	sed -n -e '/^ ..*/p' "$new" >"$tmp.new.nc"
+	if cmp "$tmp.old.nc" "$tmp.new.nc" >/dev/null
+	then
+		cat "$old"
+	else
+		cat "$new"
+		echo "<<"
+		cat "$old"
+		echo ">>"
+	fi
+}
+
 while read b
 do
 	git rev-list --no-merges "master..$b"
@@ -230,7 +246,7 @@ perl -w -e '
 			$last_empty = 1;
 			next;
 		}
-		if (/\[(.*)\]\s*$/) {
+		if (/^\[(.*)\]\s*$/) {
 			$section = $1;
 			$branch = undef;
 			next;
@@ -318,8 +334,6 @@ do
 	else
 		echo
 	fi
-	cat "$tmp.output.$newserial"
-	echo "<<"
-	cat "$tmp.template.$oldserial"
-	echo ">>"
+
+	show_topic "$tmp.template.$oldserial" "$tmp.output.$newserial"
 done <"$tmp.template.toc"