leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patman: Only use git's --no-decorate when available

Browse Source 
Older versions of git (e.g. Ubuntu 10.04) do not support this flag. By
default they do not decorate. So only enable this flag when supported.

Suggested-by: Tom Rini <trini@ti.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-08-09 15:33:11 -06:00
parent cda2a61152
commit e49f14af13
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/patman/gitutil.py
View File

@ -14,6 +14,9 @@ import terminal
import checkpatch import checkpatch
import settings import settings
# True to use --no-decorate - we check this in Setup()
use_no_decorate = True
def LogCmd(commit_range, git_dir=None, oneline=False, reverse=False, def LogCmd(commit_range, git_dir=None, oneline=False, reverse=False,
count=None): count=None):
"""Create a command to perform a 'git log' """Create a command to perform a 'git log'
@ -33,7 +36,8 @@ def LogCmd(commit_range, git_dir=None, oneline=False, reverse=False,
cmd += ['log', '--no-color'] cmd += ['log', '--no-color']
if oneline: if oneline:
cmd.append('--oneline') cmd.append('--oneline')
cmd.append('--no-decorate') if use_no_decorate:
cmd.append('--no-decorate')
if count is not None: if count is not None:
cmd.append('-n%d' % count) cmd.append('-n%d' % count)
if commit_range: if commit_range:
@ -566,6 +570,9 @@ def Setup():
alias_fname = GetAliasFile() alias_fname = GetAliasFile()
if alias_fname: if alias_fname:
settings.ReadGitAliases(alias_fname) settings.ReadGitAliases(alias_fname)
cmd = LogCmd(None, count=0)
use_no_decorate = (command.RunPipe([cmd], raise_on_error=False)
.return_code == 0)
def GetHead(): def GetHead():
"""Get the hash of the current HEAD """Get the hash of the current HEAD