Merge branch 'hbasria/master' into master

Author: RonnyPfannschmidt

CHANGELOG.rst

@@ -19,7 +19,7 @@ Bugfixes:
 * fix #321: add suppport for the ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DISTRIBUTION_NAME}`` env var to target the pretend key
 * fix #142: clearly list supported scm
 * fix #213: better error message for non-zero dev numbers in tags
-
+* fix #356: add git branch to version on describe failure
 
 v4.1.2
 =======

src/setuptools_scm/git.py

@@ -106,11 +106,16 @@ def parse(
     out, unused_err, ret = wd.do_ex(describe_command)
     if ret:
         # If 'git git_describe_command' failed, try to get the information otherwise.
+        branch, branch_err, branch_ret = wd.do_ex("git symbolic-ref --short HEAD")
+
+        if branch_ret:
+            branch = None
+
         rev_node = wd.node()
         dirty = wd.is_dirty()
 
         if rev_node is None:
-            return meta("0.0", distance=0, dirty=dirty, config=config)
+            return meta("0.0", distance=0, dirty=dirty, branch=branch, config=config)
 
         return meta(
             "0.0",

testing/test_git.py

@@ -80,6 +80,8 @@ def test_parse_call_order(wd):
 def test_version_from_git(wd):
     assert wd.version == "0.1.dev0"
 
+    assert git.parse(str(wd.cwd), git.DEFAULT_DESCRIBE).branch == "master"
+
     wd.commit_testfile()
     assert wd.version.startswith("0.1.dev1+g")
     assert not wd.version.endswith("1-")