From b3db9bb48a555e7e20aeb3c0a14316a83797b0a3 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 15 Oct 2013 20:19:06 -0700 Subject: Use git rev-parse --symbolic-full-name to get the HEAD target ref This will prevent us trying to depend on a file that doesn't exist in case someone goes on a detached HEAD. For example, this could happen during a bisect. (detached head) $ git rev-parse --symbolic-full-name HEAD HEAD (master) $ git rev-parse --symbolic-full-name HEAD refs/heads/master This will break on a packed ref, though. Signed-off-by: Thiago Macieira Signed-off-by: Dirk Hohndel --- subsurface-gen-version.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'subsurface-gen-version.pri') diff --git a/subsurface-gen-version.pri b/subsurface-gen-version.pri index 5d6170f1b..1bc1eee31 100644 --- a/subsurface-gen-version.pri +++ b/subsurface-gen-version.pri @@ -8,7 +8,7 @@ exists(.git/HEAD): { VERSION_SCRIPT = $$PWD/scripts/get-version # always use linux here -------------------vvv so we get the true full version FULL_VERSION = "`$$VERSION_SCRIPT linux`" - version_h.depends = $$VERSION_SCRIPT $$system(sed \'s/ref: \\(.*\\)/.git\\/\\1/\' $$GIT_HEAD) + version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("git rev-parse --symbolic-full-name HEAD") version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`$$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT} version_h.input = GIT_HEAD version_h.output = $$VERSION_FILE -- cgit v1.2.3-70-g09d2