Fix section detection in cook.sh
Junio C Hamano committed
Aug 23, 2009 at 15:15 UTC
08ddf0cc19f00163b3eb7a4b628f7660170b1a86
1 file changed
+19
-5
cook.sh
+19
-5
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"