+ include -unpushed in revision.inc if not all changes are pushed to the remote

(cherry picked from commit 4c1eb4e454)
This commit is contained in:
florian 2021-08-17 15:43:53 +02:00
parent 0e537519ac
commit d48e34a81d
2 changed files with 6 additions and 0 deletions

View File

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

View File

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