Skip to content

Commit ecdc74b

Browse files
authored
Merge pull request darktable-org#340 from wpferguson/script_manager_final_bug_fix
Script manager final bug fix
2 parents 688333f + 422fdbe commit ecdc74b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/script_manager.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ end
210210
local function get_current_repo_branch(repo_data)
211211
local branch = nil
212212
branch = string.match(repo_data, "On branch (.-)\n")
213-
log.msg(log.info, "\ncurrent rep0 branch is " .. branch)
213+
log.msg(log.info, "\ncurrent repo branch is " .. branch)
214214
return branch
215215
end
216216

@@ -880,7 +880,7 @@ if sm.executables.git and clean and
880880
checkout_repo_branch(repo, "master")
881881
end
882882
end
883-
elseif #branches and LUA_API_VER > branches[#branches] then
883+
elseif #branches > 0 and LUA_API_VER > branches[#branches] then
884884
log.msg(log.info, "no newer branches, staying on master")
885885
-- stay on master
886886
else

0 commit comments

Comments
 (0)