Skip to content
Snippets Groups Projects
Commit e49f14af authored by Simon Glass's avatar Simon Glass
Browse files

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


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: default avatarTom Rini <trini@ti.com>
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
parent cda2a611
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,9 @@ import terminal ...@@ -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, ...@@ -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(): ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment