Merge remote-tracking branch 'usnistgov/integration' into rel/1.0.X

(fix _setversion.sh)
usnistgov · Mar 8, 2018 · e8cd0d5 · e8cd0d5
2 parents 98364d0 + c9f6015
commit e8cd0d5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/oar-build/_setversion.sh b/oar-build/_setversion.sh
@@ -44,7 +44,9 @@ function get_tag {
         #opts=
         errfile=/tmp/git-describe-$$_err.txt
         git describe $opts 2> $errfile || {
-            grep -qs 'No names found' $errfile || {
+            grep -qs 'No names found' $errfile || \
+            grep -qs 'No tags can describe' $errfile || \
+            {
                 echo setversion: git describe failed: 1>&2
                 cat $errfile 1>&2
                 rm $errfile