merge-upstream: fix run failure when no commits

HC-22 · May 10, 2020 · e92b4f6 · e92b4f6
1 parent 3ba656a
commit e92b4f6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/merge-upstream.yml b/merge-upstream.yml
@@ -39,10 +39,14 @@ jobs:
 
     - name: Apply commit changes
       run: |
+        if [ -f ./.git/MERGE_MSG ]; then
         mkdir ./tmp && cp ./.git/MERGE_MSG ./tmp/message
         sed -i "1c [bot] AutoMerging: merge all upstream's changes:" ./tmp/message
         sed -i '/^\#.*/d' ./tmp/message
-        git commit --file="./tmp/message" || exit 0
+        git commit --file="./tmp/message"
+        else
+        echo "There is no merge commits."
+        fi
 
     - name: Push Commits
       env: