From: Fei Shao Date: Fri, 8 Sep 2023 14:15:59 +0000 (+0800) Subject: patman: Respect include directive on Git config lookup X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=ce8cb76c7cf5cadf9d4b6293df8fbede74535d93;p=u-boot.git patman: Respect include directive on Git config lookup 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 Reviewed-by: Simon Glass --- diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 6700057359..b0a12f2e8c 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