[SCM] GNU Libtool branch, master, updated. v2.2.8-16-g6897067

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  6897067b692fc9a5001087a3abaae6b478b068f7 (commit)
      from  a50e0106eac68939708e1b6bb69d2da61556c426 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6897067b692fc9a5001087a3abaae6b478b068f7
Author: Gary V. Vaughan <address@hidden>
Date:   Wed Jun 9 17:03:22 2010 +0700

    Don't warn about the blank line inserted into git commit message.
    
    * clcommit.m4sh: When searching for accidental commits of mutliple
    changes, ignore the second line of the message, which we inserted
    earlier to support "git log --oneline".

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    5 +++++
 clcommit.m4sh |    4 +++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7776be..275575b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-09  Gary V. Vaughan  <address@hidden>
 
+       Don't warn about the blank line inserted into git commit message.
+       * clcommit.m4sh: When searching for accidental commits of mutliple
+       changes, ignore the second line of the message, which we inserted
+       earlier to support "git log --oneline".
+
        Enable correct extraction of multiline copyright from --version.
        * libltdl/config/getopt.m4sh: Wrap copyright notice at 76
        columns.
diff --git a/clcommit.m4sh b/clcommit.m4sh
index c79e6b9..93d5f99 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -337,7 +337,9 @@ func_mailnotify ()
   grep '[^     ]' < "$log_file" > /dev/null ||
     func_fatal_error "empty commit message, aborting"
 
-  if grep '^$' < "$log_file" > /dev/null; then
+  # We expect line 2 to be blank, since it separates the git summary line from
+  # the commit message body, but any others are probably an error:
+  if sed 2d "$log_file" | grep '^$' > /dev/null; then
     func_error "*** Warning: blank lines should not appear within commit 
messages."
     func_error "*** They should be used to separate distinct commits."
   fi


hooks/post-receive
-- 
GNU Libtool