branch: externals/org
commit 6d37d2a8e758db7a188c22d7be14cb294b9626a9
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>

    * mk/targets.mk(GITVERSION): Provide commit number for shallow clones
    
    Fall back to using git describe --always when git describe fails in
    Org repo.
    
    See https://orgmode.org/list/87bkmve8qv....@gmail.com
---
 mk/targets.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/targets.mk b/mk/targets.mk
index 4435daa910..0bd293d680 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -14,7 +14,7 @@ ifneq ($(wildcard .git),)
   # Use the org.el header.
   ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 
'lisp-mnt)" \
     --visit lisp/org.el --eval '(princ (lm-header "version"))'))
-  GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD)
+  GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD 
2>/dev/null || echo  "release_N/A-N/A-$(shell git describe --match release\* 
--abbrev=6 --always HEAD)")
   GITSTATUS  ?= $(shell git status -uno --porcelain)
 else
  -include mk/version.mk

Reply via email to