[Cmake-commits] CMake branch, hooks, updated. f83a32feb68c5b6ee2e98f54f016daed86a7fd8f

[Brad King]

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 "CMake".

The branch, hooks has been updated
       via  f83a32feb68c5b6ee2e98f54f016daed86a7fd8f (commit)
      from  8edae204704e83968f31ed4f45c579adf646dc8b (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f83a32feb68c5b6ee2e98f54f016daed86a7fd8f
commit f83a32feb68c5b6ee2e98f54f016daed86a7fd8f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 14 14:59:45 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 14 14:59:45 2010 -0400

    commit-msg: Allow long merge commit subject lines
    
    Merge commits can have long subject lines because they name other
    branches.  Accept such messages as a special case for merge commits.

diff --git a/commit-msg b/commit-msg
index 60ddeee..92a95cd 100755
--- a/commit-msg
+++ b/commit-msg
@@ -36,6 +36,11 @@ To continue editing, run the command
 #-----------------------------------------------------------------------------
 # Check the commit message layout with a simple state machine.
 
+msg_is_merge() {
+	test -f "$GIT_DIR/MERGE_HEAD" &&
+	echo "$line" | grep "^Merge " >/dev/null 2>&1
+}
+
 msg_first() {
 	len=$(echo -n "$line" | wc -c)
 	if test $len -eq 0; then
@@ -46,7 +51,7 @@ msg_first() {
 --------
 '"$line"'
 --------'
-	elif test $len -gt 78; then
+	elif test $len -gt 78 && ! msg_is_merge; then
 		die 'The first line may be at most 78 characters:
 ------------------------------------------------------------------------------
 '"$line"'

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

Summary of changes:
 commit-msg |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake