Explicity require generic_git

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

diff --git a/global/e2-create-project.lua b/global/e2-create-project.lua
index a5d859906f34ed28cc491794eae8d08d04ab3713..fe8b3b21652fbf46ce5395dd9cde6f2244349277 100644 (file)
--- a/global/e2-create-project.lua
+++ b/global/e2-create-project.lua
@@ -28,8 +28,8 @@
 require("buildconfig")
 require("e2lib")
 require("e2option")
-require("generic_git")
 local cache = require("cache")
+local generic_git = require("generic_git")
 
 e2lib.init()
 

diff --git a/global/e2-fetch-project.lua b/global/e2-fetch-project.lua
index 06779100426336d8830610b802908c067b8927af..2426cd5c0e0d66cb68c046e26bc7a5e85d15d8ff 100644 (file)
--- a/global/e2-fetch-project.lua
+++ b/global/e2-fetch-project.lua
@@ -28,7 +28,7 @@
 require("buildconfig")
 require("e2lib")
 require("e2option")
-require("generic_git")
+local generic_git = require("generic_git")
 local cache = require("cache")
 
 e2lib.init()

diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua
index 6e14f6c71caeef54fd5f82f3b51ef7f5f33b6005..324ac9be271c1b707a26c4ad6295be148e12d63d 100644 (file)
--- a/global/e2-install-e2.lua
+++ b/global/e2-install-e2.lua
@@ -28,7 +28,7 @@
 require("buildconfig")
 require("e2lib")
 require("e2option")
-require("generic_git")
+local generic_git = require("generic_git")
 
 e2lib.init()
 

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 51320fb46a08469aed4d22a8321a36522e15ba70..35d347331bdd912184f7a9c26be65edba882dfea 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -49,7 +49,7 @@ local hash = require("hash")
 require("lock")
 require("e2util")
 require("e2option")
-require("generic_git")
+local generic_git = require("generic_git")
 require("policy")
 
 -- Information gathering and inquiry

diff --git a/local/git.lua b/local/git.lua
index 4b32e178af647b31dc6acb66f8a8369801554d06..dd4e830418f211583a9686610d4611d3b964474a 100644 (file)
--- a/local/git.lua
+++ b/local/git.lua
@@ -33,6 +33,7 @@ module("git", package.seeall)
 require("scm")
 local hash = require("hash")
 local cache = require("cache")
+local generic_git = require("generic_git")
 
 --- git branch wrapper
 -- get the current branch

diff --git a/local/new-source.lua b/local/new-source.lua
index 828372d77abce0b050d5e7c3830da94ff7d2108f..40983021ba16c352c24046ac396c85cc90a8c3de 100644 (file)
--- a/local/new-source.lua
+++ b/local/new-source.lua
@@ -30,6 +30,7 @@
 
 require("e2local")
 require("e2tool")
+local generic_git = require("generic_git")
 local cache = require("cache")
 
 e2lib.init()