[Scummvm-cvs-logs] scummvm master -> dfe62d6ec40a4650c6bc6f881542ea47611f47e4
ScummVM git
noreply at scummvm.org
Sat Feb 12 19:20:15 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dfe62d6ec4 GIT: `git describe --dirty` is too new.
Commit: dfe62d6ec40a4650c6bc6f881542ea47611f47e4
https://github.com/scummvm/scummvm/commit/dfe62d6ec40a4650c6bc6f881542ea47611f47e4
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-12T10:18:50-08:00
Commit Message:
GIT: `git describe --dirty` is too new.
do it manually via diff-index
Changed paths:
Makefile.common
diff --git a/Makefile.common b/Makefile.common
index 9b5a327..2413fa5 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
More information about the Scummvm-git-logs
mailing list