|
@@ -13,7 +13,8 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
|
# Do we have an untagged version?
|
|
# Do we have an untagged version?
|
|
if git name-rev --tags HEAD | \
|
|
if git name-rev --tags HEAD | \
|
|
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
|
|
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
|
|
- git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
|
|
|
|
|
|
+ (git describe || git describe --tags || git describe --all --long) \
|
|
|
|
+ 2>/dev/null | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
|
|
fi
|
|
fi
|
|
|
|
|
|
# Are there uncommitted changes?
|
|
# Are there uncommitted changes?
|