X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=git_hooks%2Fprepare-commit-msg;h=050e17c370ddf6786e8f71c6bfd8b90ffd9bdf58;hp=b2cf90dbb53230ec17de2caad3daa28aed9ad95f;hb=742e0b073593e47c76f28384f5717e9678be658b;hpb=504b36ad4b6730bc88666e89a0d4a3e3c03df5aa

diff --git a/git_hooks/prepare-commit-msg b/git_hooks/prepare-commit-msg
index b2cf90d..050e17c 100755
--- a/git_hooks/prepare-commit-msg
+++ b/git_hooks/prepare-commit-msg
@@ -8,14 +8,25 @@ SOURCE="$2"
 COMMIT="$3"
 
 case $SOURCE in
-'')
-    TMP=`mktemp 2> /dev/null || mktemp -t 'mytmpdir'` && \
-    cat $FILE >$TMP && \
-    git diff --cached scilab/CHANGES* |sed -n '/^+/p' |sed -n '/^+++/!p' |sed 's/^.\{1\}//g' >$FILE && \
-    cat $TMP >>$FILE && \
-    rm $TMP
-  ;;
-*)
-  ;;
+    'merge')
+        # On merges adds the commit messages found in CHANGES
+        TMP=`mktemp 2> /dev/null || mktemp -t 'mytmpdir'` && \
+            cat $FILE >$TMP && \
+            sed -i '/^Merge.*/d' $TMP && \
+            git diff --cached scilab/CHANGES* |sed -n '/^+/p' |sed -n '/^+++/!p' |sed 's/^.\{1\}//g' >$FILE && \
+            cat $TMP >>$FILE && \
+            rm $TMP
+        ;;
+
+    '')
+        # On normal commit add messages found in CHANGES
+        TMP=`mktemp 2> /dev/null || mktemp -t 'mytmpdir'` && \
+            cat $FILE >$TMP && \
+            git diff --cached scilab/CHANGES* |sed -n '/^+/p' |sed -n '/^+++/!p' |sed 's/^.\{1\}//g' >$FILE && \
+            cat $TMP >>$FILE && \
+            rm $TMP
+        ;;
+    *)
+        ;;
 esac