From 297333710fda1521b9f72af4899211d6607f8e92 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Fri, 13 Jan 2017 14:17:40 +0100 Subject: [PATCH] git: fix broken git config call, always skipping update Signed-off-by: Tobias Ulmer --- Changelog | 1 + plugins/git.lua | 6 +++--- plugins/gitrepo.lua | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index d7223cb..b262e4e 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ NEXT: + * Fix e2 fetch-sources --update for git repos * Add experimental gitrepo source type e2factory-2.3.16rc1 diff --git a/plugins/git.lua b/plugins/git.lua index 1bc7a76..949f80a 100644 --- a/plugins/git.lua +++ b/plugins/git.lua @@ -371,9 +371,9 @@ function git.update(info, sourcename) return true end - rc, re, remote = generic_git.git_config( - gitdir, "branch."..src:get_branch().."remote") - if not rc or string.len(remote) == 0 then + remote, re = generic_git.git_config( + gitdir, "branch."..src:get_branch()..".remote") + if not remote or string.len(remote) == 0 then e2lib.warnf("WOTHER", "no remote configured for branch %q. Skipping.", src:get_branch()) return true diff --git a/plugins/gitrepo.lua b/plugins/gitrepo.lua index d848b44..8334697 100644 --- a/plugins/gitrepo.lua +++ b/plugins/gitrepo.lua @@ -408,9 +408,9 @@ function gitrepo.update(info, sourcename) return true end - rc, re, remote = generic_git.git_config( - gitdir, "branch."..src:get_branch().."remote") - if not rc or string.len(remote) == 0 then + remote, re = generic_git.git_config( + gitdir, "branch."..src:get_branch()..".remote") + if not remote or string.len(remote) == 0 then e2lib.warnf("WOTHER", "no remote configured for branch %q. Skipping.", src:get_branch()) return true -- 2.39.5