git: fix broken git config call, always skipping update

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/Changelog b/Changelog
index d7223cb5bcb1d47c41d4c170656b9fdd6343dd2c..b262e4e6388913554e16f3ea79abf1247030d7a5 100644 (file)
--- 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 1bc7a76788a5a91b23381feed8028bc0fcc4f601..949f80a72ccf9cff59c26d9fcdfbdf60d7b0317b 100644 (file)
--- 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 d848b44256ef2f49fa891dfed37d6ed45ef92079..8334697269cf7b33de851edb68f8ab5c4e3c9d00 100644 (file)
--- 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