mirror of
https://github.com/pi-hole/dnsmasq.git
synced 2025-12-19 10:18:25 +00:00
Make get-version work when repo is a git submodule.
This commit is contained in:
committed by
Simon Kelley
parent
a5ae1f8587
commit
8efd731cc4
@@ -11,8 +11,9 @@
|
|||||||
# If there is more than one v[0-9].* tag, sort them and use the
|
# If there is more than one v[0-9].* tag, sort them and use the
|
||||||
# first. This favours, eg v2.63 over 2.63rc6.
|
# first. This favours, eg v2.63 over 2.63rc6.
|
||||||
|
|
||||||
if which git >/dev/null 2>&1 && [ -d $1/.git ]; then
|
if which git >/dev/null 2>&1 && \
|
||||||
cd $1; git describe | sed 's/^v//'
|
([ -d $1/.git ] || grep '^gitdir:' $1/.git >/dev/null 2>&1); then
|
||||||
|
cd $1; git describe | sed 's/^v//'
|
||||||
elif grep '\$Format:%d\$' $1/VERSION >/dev/null 2>&1; then
|
elif grep '\$Format:%d\$' $1/VERSION >/dev/null 2>&1; then
|
||||||
# unsubstituted VERSION, but no git available.
|
# unsubstituted VERSION, but no git available.
|
||||||
echo UNKNOWN
|
echo UNKNOWN
|
||||||
|
|||||||
Reference in New Issue
Block a user