[PATCH 1/5] patman: Untangle settings from gitutil

[Simon Glass]

The gitutil module is supposed to be independent from patman but one
piece was missed in the series which separated them.

Move the settings setup out of gitutil

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 tools/patman/control.py       | 4 ++++
 tools/u_boot_pylib/gitutil.py | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/patman/control.py b/tools/patman/control.py
index b8a45912058..c1b6e41e2d2 100644
--- a/tools/patman/control.py
+++ b/tools/patman/control.py
@@ -13,6 +13,7 @@ import sys
 
 from patman import checkpatch
 from patman import patchstream
+from patman import settings
 from u_boot_pylib import gitutil
 from u_boot_pylib import terminal
 
@@ -20,6 +21,9 @@ from u_boot_pylib import terminal
 def setup():
     """Do required setup before doing anything"""
     gitutil.setup()
+    alias_fname = gitutil.get_alias_file()
+    if alias_fname:
+        settings.ReadGitAliases(alias_fname)
 
 
 def prepare_patches(col, branch, count, start, end, ignore_binary, signoff,
diff --git a/tools/u_boot_pylib/gitutil.py b/tools/u_boot_pylib/gitutil.py
index 0376bece3e6..8935b6cc847 100644
--- a/tools/u_boot_pylib/gitutil.py
+++ b/tools/u_boot_pylib/gitutil.py
@@ -693,9 +693,6 @@ def setup():
     # Check for a git alias file also
     global USE_NO_DECORATE
 
-    alias_fname = get_alias_file()
-    if alias_fname:
-        settings.ReadGitAliases(alias_fname)
     cmd = log_cmd(None, count=0)
     USE_NO_DECORATE = (command.run_one(*cmd, raise_on_error=False)
                        .return_code == 0)
-- 
2.43.0