allow sync extension to continue even if git log empty

sensu · Apr 6, 2020 · 08e5819 · 08e5819
1 parent a146929
commit 08e5819
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/interactors/sync_extension_contents_at_versions.rb b/app/interactors/sync_extension_contents_at_versions.rb
@@ -94,13 +94,16 @@ def set_compatible_platforms(version)
   end
 
   def set_last_commit(version)
-    commit = command_run.cmd("git log -1").gsub(/^Merge: [^\n]+\n/, "")
+    commit = command_run.cmd("git log -1")
+    # no git log for this release
+    return if commit.blank?
+
+    commit.gsub!(/^Merge: [^\n]+\n/, "")
     sha, author, date = *commit.split("\n")
 
-    unless message = commit.split("\n\n").last
-      # Empty repo; no commits
-      return
-    end
+    message = commit.split("\n\n").last
+    # Empty repo; no commits
+    return if message.blank?
 
     message = message.gsub("\n", " ").strip
     sha = sha.gsub("commit ", "")