the same without syntax errors

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index 4da0b4d8260f5d5942e8ae36741353ade0569392..b55d974c58ff93c23df4b4dd0e135640a9010da6 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -17,8 +17,13 @@ for file in $filelist; do
        merge=`echo $file | grep Merge`
        modif=`echo $file | grep Locally`
        patch=`echo $file | grep -i patch`
-       if [ "$merge" != "" || "$patch" != "" ]; then
-               echo $merge $patch
+       if [ "$patch" != "" ]; then
+               echo $patch 
+               echo You have to update first
+               exit
+       fi;
+       if [ "$merge" != "" ]; then
+               echo $merge 
                echo You have to update first
                exit
        fi;