projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/bvanassche/fio into master
[fio.git]
/
FIO-VERSION-GEN
diff --git
a/FIO-VERSION-GEN
b/FIO-VERSION-GEN
index 04802dd43e014b878b6659500ab388039b27a2da..48e575fc53431e016db75f8811a7f51a06d1b0e8 100755
(executable)
--- a/
FIO-VERSION-GEN
+++ b/
FIO-VERSION-GEN
@@
-1,7
+1,7
@@
#!/bin/sh
GVF=FIO-VERSION-FILE
#!/bin/sh
GVF=FIO-VERSION-FILE
-DEF_VER=fio-
2.12
+DEF_VER=fio-
3.21
LF='
'
LF='
'
@@
-15,7
+15,7
@@
elif test -d .git -o -f .git &&
VN=`git describe --match "fio-[0-9]*" --abbrev=4 HEAD 2>/dev/null` &&
case "$VN" in
*$LF*) (exit 1) ;;
VN=`git describe --match "fio-[0-9]*" --abbrev=4 HEAD 2>/dev/null` &&
case "$VN" in
*$LF*) (exit 1) ;;
-
v
[0-9]*)
+
fio-
[0-9]*)
git update-index -q --refresh
test -z "`git diff-index --name-only HEAD --`" ||
VN="$VN-dirty" ;;
git update-index -q --refresh
test -z "`git diff-index --name-only HEAD --`" ||
VN="$VN-dirty" ;;
@@
-38,5
+38,3
@@
test "$VN" = "$VC" || {
echo >&2 "FIO_VERSION = $VN"
echo "FIO_VERSION = $VN" >$GVF
}
echo >&2 "FIO_VERSION = $VN"
echo "FIO_VERSION = $VN" >$GVF
}
-
-