shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

meson-vcs-tag: add work-around for git bug

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-12-19 13:25:07 +01:00
parent 681bd2c524
commit e4d5753bd0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -584,7 +584,7 @@ endif
#####################################################################
vcs_tagger = [meson.source_root() + '/tools/meson-vcs-tag.sh',
'@0@/.git'.format(meson.source_root()),
meson.source_root(),
meson.project_version()]
sed = find_program('sed')

7
tools/meson-vcs-tag.sh
View File

@ -3,7 +3,10 @@
set -eu
set -o pipefail
gitdir="$1"
dir="$1"
fallback="$2"
git --git-dir="$gitdir" describe --abbrev=7 --dirty=+ 2>/dev/null | sed 's/^v//' || echo "$fallback"
# Apparently git describe has a bug where it always considers the work-tree
# dirty when invoked with --git-dir (even though 'git status' is happy). Work
# around this issue by cd-ing to the source directory.
cd "$dir" && git describe --abbrev=7 --dirty=+ 2>/dev/null | sed 's/^v//' || echo "$fallback"