Merge pull request #279 from BubuOT/version_fix

determineVersion.sh: prevent traversing into outer git repo for git-describe call
raboof · Sep 20, 2024 · 632a788 · 632a788
2 parents 0fe341e + 6423bdf
commit 632a788
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/determineVersion.sh b/determineVersion.sh
@@ -1,3 +1,6 @@
 #!/bin/bash
-
-(git describe --tags 2>/dev/null || pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//") | tail -c +2
+if [ $(git rev-parse --show-toplevel 2>/dev/null) == $(pwd) ]; then
+  git describe --tags 2>/dev/null | tail -c +2
+else
+  pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//" | tail -c +2
+fi