auto commit

gitPush.sh

@@ -10,21 +10,22 @@ 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 "没有冲突，继续"
-  echo "远程目标分支: $originBranch "
-  echo "远程目标分支最新commit: $current_id"
-  git reset --soft $current_id
-  git add .
-  git commit -m "$msg"
-  git push origin  --force-with-lease $result # 提交代码到github(修改了远程项目名)
+    current_id=`git log -n 1 $originBranch --pretty=format:"%H"`
+    echo "没有冲突，继续"
+    echo "远程目标分支: $originBranch "
+    echo "远程目标分支最新commit: $current_id"
+    git reset --soft $current_id
+    git add .
+    git commit -m "$msg"
+    git push origin  --force-with-lease $result # 提交代码到github(修改了远程项目名)
   else
-  git add .
-  git commit -m "auto commit"
-  git push origin $result
-  echo "本地分支和origin/release存在冲突"
-  echo "result: $result $diff"
+    git add .
+    git commit -m "auto commit"
+    git push origin $result
+    echo "本地分支和origin/release存在冲突"
+    echo "result: $result $diff"
   fi
 fi
\ No newline at end of file