auto commit

gitPush.sh

@@ -10,7 +10,8 @@ else
   git fetch --all
   result=`git symbolic-ref --short -q HEAD` # 获取分支名
   diff=`git diff $result $originBranch | grep -i ">>>>>>"`
-  if test $diff -eq ""
+  empty=""
+  if test $diff -eq $empty
   then
     current_id=`git log -n 1 $originBranch --pretty=format:"%H"`
     echo "没有冲突，继续"