dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

patman: force git log commands to not use color

Browse Source 
Colored logs confuse patman when analyzing logs.
Add --no-color option in git log commands in case
the default config has color.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Albert ARIBAUD
2012-10-15 09:55:50 +00:00
committed by Tom Rini
parent eeaec258b7
commit 7f14f30a6d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/patman/gitutil.py
View File

@@ -38,7 +38,7 @@ def CountCommitsToBranch():
Return: Return:
Number of patches that exist on top of the branch Number of patches that exist on top of the branch
""" """
pipe = [['git', 'log', '--oneline', '@{upstream}..'], pipe = [['git', 'log', '--no-color', '--oneline', '@{upstream}..'],
['wc', '-l']] ['wc', '-l']]
stdout = command.RunPipe(pipe, capture=True, oneline=True) stdout = command.RunPipe(pipe, capture=True, oneline=True)
patch_count = int(stdout) patch_count = int(stdout)

3
tools/patman/patchstream.py
View File

@@ -344,7 +344,8 @@ def GetMetaData(start, count):
start: Commit to start from: 0=HEAD, 1=next one, etc. start: Commit to start from: 0=HEAD, 1=next one, etc.
count: Number of commits to list count: Number of commits to list
""" """
pipe = [['git', 'log', '--reverse', 'HEAD~%d' % start, '-n%d' % count]] pipe = [['git', 'log', '--no-color', '--reverse', 'HEAD~%d' % start,
'-n%d' % count]]
stdout = command.RunPipe(pipe, capture=True) stdout = command.RunPipe(pipe, capture=True)
series = Series() series = Series()
ps = PatchStream(series, is_log=True) ps = PatchStream(series, is_log=True)