diff options
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index 9b5a327f72..2413fa572b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -169,8 +169,10 @@ VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-) ifneq ($(shell cd $(srcdir); git rev-parse --verify HEAD 1>/dev/null 2>&1 || echo "error"),error) GITROOT := $(srcdir) ifeq ($(origin VER_REV), undefined) +# Are there uncommitted changes? (describe --dirty is only available since 1.6.6) +VER_DIRTY := $(shell cd $(srcdir); git update-index --refresh --unmerged 1>/dev/null 2>&1; git diff-index --quiet HEAD || echo "-dirty") # Get the working copy base revision -VER_REV := $(shell cd $(srcdir); git describe --match desc/\* --dirty | cut -d '-' -f 2-) +VER_REV := $(shell cd $(srcdir); git describe --match desc/\* | cut -d '-' -f 2-)$(VER_DIRTY) endif else GITROOT := git://github.com/scummvm/scummvm.git |