commit 7871223196be4bc49f73c0e6053b9b9e5be97725
author Fei Shao <fshao@chromium.org> Fri Sep 08 22:15:59 2023 +0800
committer Simon Glass <sjg@chromium.org> Sat Sep 23 09:00:37 2023 -0600
tree d8eed604d7be87eb9f7c9d58545f174a5cbd4c22
parent 3322437e175defce121060409ef61004939a3efa

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 <fshao@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

tools/patman/gitutil.py

diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index 6700057..b0a12f2 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -651,7 +651,7 @@
     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 @@
     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