diff options
| author | dhewg | 2011-02-12 19:18:50 +0100 |
|---|---|---|
| committer | dhewg | 2011-02-12 19:18:50 +0100 |
| commit | dfe62d6ec40a4650c6bc6f881542ea47611f47e4 (patch) | |
| tree | c92a4065e5dbaa528d92602774ded0d0217087cd | |
| parent | d794bfc4fa94acb994460dc687da408f65bbf977 (diff) | |
| download | scummvm-rg350-dfe62d6ec40a4650c6bc6f881542ea47611f47e4.tar.gz scummvm-rg350-dfe62d6ec40a4650c6bc6f881542ea47611f47e4.tar.bz2 scummvm-rg350-dfe62d6ec40a4650c6bc6f881542ea47611f47e4.zip | |
GIT: `git describe --dirty` is too new.
do it manually via diff-index
| -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 |