diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-10-15 20:19:06 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-15 20:24:14 -0700 |
| commit | b3db9bb48a555e7e20aeb3c0a14316a83797b0a3 (patch) | |
| tree | dfae3cc0ab69afe1a975c3a9969216f661dcca32 /subsurface-gen-version.pri | |
| parent | f96299ea942ac91976f576bc2e1b2db76ba4c72e (diff) | |
| download | subsurface-b3db9bb48a555e7e20aeb3c0a14316a83797b0a3.tar.gz | |
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 <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-gen-version.pri')
| -rw-r--r-- | subsurface-gen-version.pri | 2 |
1 files changed, 1 insertions, 1 deletions
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 |