2
0
Эх сурвалжийг харах

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

(cherry picked from commit 3e3f99c328be386e9cf6b7f2cceaab9c5283873e)
florian 4 жил өмнө
parent
commit
1fd49868c7

+ 1 - 1
compiler/Makefile

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

+ 1 - 1
compiler/Makefile.fpc

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