From: Simon Glass <sjg@chromium.org>
Date: Sat, 9 Aug 2014 21:33:11 +0000 (-0600)
Subject: patman: Only use git's --no-decorate when available
X-Git-Tag: v2014.10-rc2~124
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2014.10-rc1-00075-ge49f14af1349;p=u-boot

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: Tom Rini <trini@ti.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index a8b0a1a625..735c8dddac 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -14,6 +14,9 @@ import terminal
 import checkpatch
 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,
            count=None):
     """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']
     if oneline:
         cmd.append('--oneline')
-    cmd.append('--no-decorate')
+    if use_no_decorate:
+        cmd.append('--no-decorate')
     if count is not None:
         cmd.append('-n%d' % count)
     if commit_range:
@@ -566,6 +570,9 @@ def Setup():
     alias_fname = GetAliasFile()
     if 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():
     """Get the hash of the current HEAD