Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

patman: Respect include directive on Git config lookup

Browse source 
People may put their user name and email in a local config file and
reference it by the include.* directives, however `git config --global`
doesn't look up the included configs by default.

Enable the --includes option explicitly to support such use cases.

Signed-off-by: Fei Shao <fshao@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Fei Shao 2023-09-08 22:15:59 +08:00 • committed by Simon Glass
parent 92271d6104
commit ce8cb76c7c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/patman/gitutil.py
View file

@ -651,7 +651,7 @@ def get_default_user_name():
Returns: Returns:
User name found in .gitconfig file, or None if none 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 return uname
@ -661,7 +661,7 @@ def get_default_user_email():
Returns: Returns:
User's email found in .gitconfig file, or None if none 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 return uemail