prevent commiting when configure.ac needs patch
authorColin Leroy <colin@colino.net>
Tue, 12 Apr 2005 17:56:12 +0000 (17:56 +0000)
committerColin Leroy <colin@colino.net>
Tue, 12 Apr 2005 17:56:12 +0000 (17:56 +0000)
commitHelper

index ad7bbc4..4da0b4d 100644 (file)
@@ -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;