Merge pull request #6626 from ipfs/fix/6622

build: fix build when we don't have a full git tree
ipfs · Sep 4, 2019 · 1bcea7c · 1bcea7c
2 parents 5b44f48 + aba6c3d
commit 1bcea7c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/mk/git.mk b/mk/git.mk
@@ -1,2 +1,4 @@
-git-hash:=$(shell git describe --always --match=NeVeRmAtCh --dirty 2>/dev/null)
-
+# First try to "describe" the state. This tells us if the state is dirty.
+# If that fails (e.g., we're building a docker image and have an empty objects
+# directory), assume the source isn't dirty and build anyways.
+git-hash:=$(shell git describe --always --match=NeVeRmAtCh --dirty 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)