Fix version detection in case of missing .git folder

dolfinus · Oct 7, 2020 · bc7e350 · bc7e350
1 parent 07addd8
commit bc7e350
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/setuptools_git_versioning.py b/setuptools_git_versioning.py
@@ -167,15 +167,16 @@ def version_from_git(template=DEFAULT_TEMPLATE,
 
     dirty = is_dirty()
     head_sha = get_sha()
+    short_sha = head_sha[:8] if head_sha is not None else ''
     ccount = count_since(tag_sha)
-    on_tag = head_sha == tag_sha and not from_file
+    on_tag = head_sha is not None and head_sha == tag_sha and not from_file
     branch = get_branch()
 
     if dirty:
         t = dirty_template
-    elif not on_tag:
+    elif not on_tag and ccount is not None:
         t = dev_template
     else:
         t = template
 
-    return t.format(sha=head_sha[:8], tag=tag, ccount=ccount, branch=branch)
+    return t.format(sha=short_sha, tag=tag, ccount=ccount, branch=branch)