Merge pull request #34462 from terminalmage/git-describe-always

Use --always when available to git describe
saltstack · Jul 6, 2016 · e2f576e · e2f576e
2 parents 85f1f18 + 6ef7ee1
commit e2f576e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/salt/modules/git.py b/salt/modules/git.py
@@ -1350,7 +1350,10 @@ def describe(cwd, rev='HEAD', user=None, ignore_retcode=False):
     cwd = _expand_path(cwd, user)
     if not isinstance(rev, six.string_types):
         rev = str(rev)
-    command = ['git', 'describe', rev]
+    command = ['git', 'describe']
+    if _LooseVersion(version(versioninfo=False)) >= _LooseVersion('1.5.6'):
+        command.append('--always')
+    command.append(rev)
     return _git_run(command,
                     cwd=cwd,
                     runas=user,