--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-01  Jim Meyering  <meyering@redhat.com>
+
+	gitlog-to-changelog: avoid an infloop
+	* build-aux/gitlog-to-changelog: Don't infloop for a commit log
+	that ends up being empty.
+
 2011-11-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* MODULES.html.sh: Fix sed-script shell quoting and locale issues.

--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -160,8 +160,11 @@
       @line = grep !/^Signed-off-by: .*>$/, @line;
 
       # Remove leading and trailing blank lines.
-      while ($line[0] =~ /^\s*$/) { shift @line; }
-      while ($line[$#line] =~ /^\s*$/) { pop @line; }
+      if (@line)
+        {
+          while ($line[0] =~ /^\s*$/) { shift @line; }
+          while ($line[$#line] =~ /^\s*$/) { pop @line; }
+        }
 
       # If there were any lines
       if (@line == 0)