summaryrefslogtreecommitdiff
path: root/tools/patman/gitutil.py
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-09-24 17:15:15 -0400
committerTom Rini <trini@konsulko.com>2023-09-24 17:15:15 -0400
commit729b0104bb9f658eb4212a1b880873eb781874de (patch)
tree97e9fe98dfc5b00ef2211fa1c1c65a7022612798 /tools/patman/gitutil.py
parent4cb31a9f3560b293670de95e76c1f3cf2f9e1ca8 (diff)
parente278ad9a2ea5e4a089773a8fd79a5ea0e8572316 (diff)
Merge tag 'dm-pull-23sep23' of https://source.denx.de/u-boot/custodians/u-boot-dm
trace: correct format of flyrecord minor bug fixes
Diffstat (limited to 'tools/patman/gitutil.py')
-rw-r--r--tools/patman/gitutil.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index 6700057359f..b0a12f2e8c0 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -651,7 +651,7 @@ def get_default_user_name():
Returns:
User name found in .gitconfig file, or None if none
"""
- uname = command.output_one_line('git', 'config', '--global', 'user.name')
+ uname = command.output_one_line('git', 'config', '--global', '--includes', 'user.name')
return uname
@@ -661,7 +661,7 @@ def get_default_user_email():
Returns:
User's email found in .gitconfig file, or None if none
"""
- uemail = command.output_one_line('git', 'config', '--global', 'user.email')
+ uemail = command.output_one_line('git', 'config', '--global', '--includes', 'user.email')
return uemail