summaryrefslogtreecommitdiff
path: root/tools/patman/gitutil.py
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-01-13 14:33:02 -0500
committerTom Rini <trini@konsulko.com>2022-01-13 14:33:02 -0500
commit25711b07ca1dcf73dc41b45ca040dadbcff0fa08 (patch)
treede49c129e19ab9b129aca41d59cd8ecdc3e18de7 /tools/patman/gitutil.py
parent743c562d0c5269740236864bdb0002e73ec3e614 (diff)
parent6c9e3d1fc085977b5b38dfe610f65d1a7f48081b (diff)
Merge tag 'dm-pull-13jan22' of https://source.denx.de/u-boot/custodians/u-boot-dm
bloblist prep for standard passage switch order of pinctrl and power domain calls various minor fixes
Diffstat (limited to 'tools/patman/gitutil.py')
-rw-r--r--tools/patman/gitutil.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index 5e4c1128dcb..e1ef96df22e 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -616,9 +616,14 @@ def GetAliasFile():
"""
fname = command.OutputOneLine('git', 'config', 'sendemail.aliasesfile',
raise_on_error=False)
- if fname:
- fname = os.path.join(GetTopLevel(), fname.strip())
- return fname
+ if not fname:
+ return None
+
+ fname = os.path.expanduser(fname.strip())
+ if os.path.isabs(fname):
+ return fname
+
+ return os.path.join(GetTopLevel(), fname)
def GetDefaultUserName():
"""Gets the user.name from .gitconfig file.