diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2021-04-13 14:41:18 +0300 |
|---|---|---|
| committer | Ralph Giles <giles@thaumas.net> | 2021-06-16 01:20:12 +0300 |
| commit | 61747bc6ec728de69d54db6ece90ad4617f059b8 (patch) | |
| tree | afaa76205fc2bedecdf9812989c43799e56d9041 | |
| parent | 1639592368fc2dadc82d63f3be6f17ed0b554d71 (diff) | |
meson: fix get-version script for git worktrees
For git worktree directories .git is not a directory
but a file that points to the real .git dir.
The `update_version` script used by other builds
works correctly with git worktrees.
Signed-off-by: Ralph Giles <giles@thaumas.net>
| -rwxr-xr-x | meson/get-version.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson/get-version.py b/meson/get-version.py index 0e8b8623..d3835f13 100755 --- a/meson/get-version.py +++ b/meson/get-version.py @@ -31,7 +31,7 @@ if __name__ == '__main__': # check if git checkout git_dir = os.path.join(srcroot, '.git') - is_git = os.path.isdir(git_dir) + is_git = os.path.isdir(git_dir) or os.path.isfile(git_dir) have_git = shutil.which('git') is not None if is_git and have_git: |