From 08e5819791fc2509aa13a45b023a97a29b672319 Mon Sep 17 00:00:00 2001 From: "pzupan@gmail.com" Date: Mon, 23 Mar 2020 11:16:12 -0700 Subject: [PATCH] allow sync extension to continue even if git log empty --- .../sync_extension_contents_at_versions.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/interactors/sync_extension_contents_at_versions.rb b/app/interactors/sync_extension_contents_at_versions.rb index c7e558ed..812f700b 100755 --- 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 ", "")