Browse Source

* properly check if -unpushed should be appended in revision.inc

florian 4 years ago
parent
commit
838cc89fac
2 changed files with 2 additions and 2 deletions
  1. 1 1
      compiler/Makefile
  2. 1 1
      compiler/Makefile.fpc

+ 1 - 1
compiler/Makefile

@@ -575,7 +575,7 @@ ifneq ($(wildcard ../.git),)
 ifneq ($(GIT),)
 ifneq ($(GIT),)
 GITDESCRIBE=$(shell $(GIT) describe --dirty)
 GITDESCRIBE=$(shell $(GIT) describe --dirty)
 REVSTR:=$(word 2,$(subst -, ,$(GITDESCRIBE)))-$(word 3,$(subst -, ,$(GITDESCRIBE)))
 REVSTR:=$(word 2,$(subst -, ,$(GITDESCRIBE)))-$(word 3,$(subst -, ,$(GITDESCRIBE)))
-ifneq (git log @{u}..,)
+ifneq ($(shell $(GIT) log @{u}..),)
 REVSTR:=$(REVSTR)-unpushed
 REVSTR:=$(REVSTR)-unpushed
 endif
 endif
 ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),)
 ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),)

+ 1 - 1
compiler/Makefile.fpc

@@ -315,7 +315,7 @@ ifneq ($(wildcard ../.git),)
 ifneq ($(GIT),)
 ifneq ($(GIT),)
 GITDESCRIBE=$(shell $(GIT) describe --dirty)
 GITDESCRIBE=$(shell $(GIT) describe --dirty)
 REVSTR:=$(word 2,$(subst -, ,$(GITDESCRIBE)))-$(word 3,$(subst -, ,$(GITDESCRIBE)))
 REVSTR:=$(word 2,$(subst -, ,$(GITDESCRIBE)))-$(word 3,$(subst -, ,$(GITDESCRIBE)))
-ifneq (git log @{u}..,)
+ifneq ($(shell $(GIT) log @{u}..),)
 REVSTR:=$(REVSTR)-unpushed
 REVSTR:=$(REVSTR)-unpushed
 endif
 endif
 ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),)
 ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),)