Summary: prepare-commit-msg skip merges, -m flag, squash, template

Marcus Sorensen · Marcus Sorensen · commit a3c9a2b22d53 · 2012-10-18T16:53:42.000-06:00
Detail: prepare-commit-msg now is skipped if -m flag is supplied, if user has
a template defined, if commit is a squash or a merge.

BUG-ID : none
Reviewed-by: Marcus Sorensen &lt;marcus@betterservers.com&gt;
Reported-by: Marcus Sorensen &lt;marcus@betterservers.com&gt;
Signed-off-by: Marcus Sorensen &lt;marcus@betterservers.com&gt; 1350600822 -0600
diff --git a/tools/git/prepare-commit-msg b/tools/git/prepare-commit-msg
@@ -35,7 +35,9 @@
 # SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
 # grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
 
-cat <<EOF > $1
+run_generic_commit () {
+local file=$1
+cat <<EOF > $file
 ################################# 80 chars #####################################
 # The following is an example of how to fill out the above form. Please limit
 # your formatting to 80 cols.
@@ -60,5 +62,25 @@ Detail: \n\n\
 BUG-ID : \n\
 Reviewed-by: \n\
 Reported-by: \n\
-Signed-off-by: ${SOB}\n\n/" $1 
+Signed-off-by: ${SOB}\n\n/" $file
+
+}
+
+case "$2,$3" in
+  merge,*)
+  ;;
+
+  template,*)
+  ;;
+
+  message,*)
+  ;;
+
+  squash,*)
+  ;;
+
+  *)
+  run_generic_commit $1
+  ;;
+esac
 
