mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-07 01:05:56 +02:00
+ include -unpushed in revision.inc if not all changes are pushed to the remote
(cherry picked from commit 4c1eb4e454
)
This commit is contained in:
parent
0e537519ac
commit
d48e34a81d
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user