prevent commiting when configure.ac needs patch

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index ad7bbc41a017e5d48c4e987496cb94cfb1fcce38..4da0b4d8260f5d5942e8ae36741353ade0569392 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -16,9 +16,9 @@ filelist=`cvs status $@ configure.ac 2>/dev/null |grep ^File`
 for file in $filelist; do
        merge=`echo $file | grep Merge`
        modif=`echo $file | grep Locally`
-
-       if [ "$merge" != "" ]; then
-               echo $merge
+       patch=`echo $file | grep -i patch`
+       if [ "$merge" != "" || "$patch" != "" ]; then
+               echo $merge $patch
                echo You have to update first
                exit
        fi;