Skip to content

D
Dnsmasq
Commit 8efd731c authored by Johnny S. Lee's avatar Johnny S. Lee Committed by Simon Kelley
Browse files
Options

Make get-version work when repo is a git submodule.

parent a5ae1f85
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
bld/get-version
View file @ 8efd731c
...@@ -11,8 +11,9 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment