[U-Boot] [PATCH] patman: fix gitutil for decorations

Andreas Bießmann andreas.devel at googlemail.com
Tue Apr 16 11:30:23 CEST 2013


The git config parameter log.decorate is quite useful when working with git.
Patman, however can not handle the decorated output when parsing the commit.
To prevent this use the '--no-decorate' switch for git-log.

Signed-off-by: Andreas Bießmann <andreas.devel at googlemail.com>
Cc: Tom Rini <trini at ti.com>
Cc: Simon Glass <sjg at chromium.org>
---

Since this is required for me to get patman working it would be great to have
this trivial change in the upcoming release.

 tools/patman/gitutil.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index f485750..8b61410 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -39,7 +39,8 @@ def CountCommitsToBranch():
     Return:
         Number of patches that exist on top of the branch
     """
-    pipe = [['git', 'log', '--no-color', '--oneline', '@{upstream}..'],
+    pipe = [['git', 'log', '--no-color', '--oneline', '--no-decorate',
+             '@{upstream}..'],
             ['wc', '-l']]
     stdout = command.RunPipe(pipe, capture=True, oneline=True).stdout
     patch_count = int(stdout)
-- 
1.7.10.4



More information about the U-Boot mailing list