X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=tools%2Fmeson-vcs-tag.sh;h=1c3814d4830b3c523e0fc1cedd7e4c5e947bf98d;hb=f649325ba73a7165a14c1f1134b30b12a96d3718;hp=4345c2145a38b4bc1edd27d415c452ecedb0114a;hpb=e4d5753bd094cf542f54edbbd58417a5394f5384;p=thirdparty%2Fsystemd.git

diff --git a/tools/meson-vcs-tag.sh b/tools/meson-vcs-tag.sh
index 4345c2145a3..1c3814d4830 100755
--- a/tools/meson-vcs-tag.sh
+++ b/tools/meson-vcs-tag.sh
@@ -1,12 +1,22 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
 
 dir="$1"
-fallback="$2"
+tag="$2"
+fallback="$3"
+
+if [ -n "$tag" ]; then
+    echo "$tag"
+    exit 0
+fi
 
 # 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"
+cd "$dir"
+# Check that we have either .git/ (a normal clone) or a .git file (a work-tree)
+# and that we don't get confused if a tarball is extracted in a higher-level
+# git repository.
+[ -e .git ] && git describe --abbrev=7 --dirty=+ 2>/dev/null | sed 's/^v//' || echo "$fallback"