diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-15 09:55:50 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-19 15:25:46 -0700 |
| commit | 7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e (patch) | |
| tree | 30072ee2c438c00c1f163a69233a6eeff4ea9537 | |
| parent | eeaec258b751075d48e081d645516dab3240ab96 (diff) | |
| download | u-boot-imx-7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e.zip u-boot-imx-7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e.tar.gz u-boot-imx-7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e.tar.bz2 | |
patman: force git log commands to not use color
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>
| -rw-r--r-- | tools/patman/gitutil.py | 2 | ||||
| -rw-r--r-- | tools/patman/patchstream.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 59eca99..72d37a0 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -38,7 +38,7 @@ def CountCommitsToBranch(): Return: Number of patches that exist on top of the branch """ - pipe = [['git', 'log', '--oneline', '@{upstream}..'], + pipe = [['git', 'log', '--no-color', '--oneline', '@{upstream}..'], ['wc', '-l']] stdout = command.RunPipe(pipe, capture=True, oneline=True) patch_count = int(stdout) diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 0503bac..ad280cc 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -344,7 +344,8 @@ def GetMetaData(start, count): start: Commit to start from: 0=HEAD, 1=next one, etc. 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) series = Series() ps = PatchStream(series, is_log=True) |