Merge pull request #340 from wpferguson/script_manager_final_bug_fix

Script manager final bug fix
This commit is contained in:
wpferguson
2021-07-02 21:35:16 -04:00
committed by GitHub

View File

@@ -210,7 +210,7 @@ end
local function get_current_repo_branch(repo_data) local function get_current_repo_branch(repo_data)
local branch = nil local branch = nil
branch = string.match(repo_data, "On branch (.-)\n") branch = string.match(repo_data, "On branch (.-)\n")
log.msg(log.info, "\ncurrent rep0 branch is " .. branch) log.msg(log.info, "\ncurrent repo branch is " .. branch)
return branch return branch
end end
@@ -880,7 +880,7 @@ if sm.executables.git and clean and
checkout_repo_branch(repo, "master") checkout_repo_branch(repo, "master")
end end
end end
elseif #branches and LUA_API_VER > branches[#branches] then elseif #branches > 0 and LUA_API_VER > branches[#branches] then
log.msg(log.info, "no newer branches, staying on master") log.msg(log.info, "no newer branches, staying on master")
-- stay on master -- stay on master
else else