diff options
| author | Simon Glass <[email protected]> | 2025-04-07 22:51:43 +1200 |
|---|---|---|
| committer | Simon Glass <[email protected]> | 2025-05-27 10:07:41 +0100 |
| commit | e70fdbd7e49327d4db24e7b2208da87278070d73 (patch) | |
| tree | 564c253ee321bb3ddef05c00db0e4f2f760ff047 /tools | |
| parent | f9b84f9141898ffa3d4cfe40814128050b04444b (diff) | |
patman: Untangle settings from gitutil
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 <[email protected]>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/patman/control.py | 4 | ||||
| -rw-r--r-- | 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 cfea35ea648..fbf368cb2fa 100644 --- a/tools/patman/control.py +++ b/tools/patman/control.py @@ -26,11 +26,15 @@ from patman import checkpatch from patman import patchstream from patman import patchwork from patman import send +from patman import settings def setup(): """Do required setup before doing anything""" gitutil.setup() + alias_fname = gitutil.get_alias_file() + if alias_fname: + settings.ReadGitAliases(alias_fname) def do_send(args): 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) |