auto commit

gitPush.sh

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