Fix not to skip necessary commits

1 files changed, 3 insertions, 5 deletions

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 64ed891451..f404b7ff50 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -626,14 +626,12 @@ module SyncDefaultGems
       return picked || nil      # Fail unless cherry-picked
     end
 
-    if porcelain_status().empty?
-      system(*%w"git cherry-pick --skip")
-      return false
-    end
-
     # Commit cherry-picked commit
     if picked
       system(*%w"git commit --amend --no-edit")
+    elsif porcelain_status().empty?
+      system(*%w"git cherry-pick --skip")
+      return false
     else
       system(*%w"git cherry-pick --continue --no-edit")
     end or return nil