aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro@lisha.ufsc.br>2011-01-16 18:34:09 +0000
committerJanne Grunau <janne-ffmpeg@jannau.net>2011-01-16 18:34:09 +0000
commit8032d1dee9dfa855a4e03da840b72a82e2f9a86b (patch)
treeb9f452a97f371f27f4f2838fbc79da7a43bc5c44
parentadb8669c04fae980710342a9fb3016c87df60709 (diff)
downloadffmpeg-8032d1dee9dfa855a4e03da840b72a82e2f9a86b.tar.gz
use git describe for naming version in pure git clones
Patch by: Ramiro Polla <ramiro <DOT> polla gmail <DOT> com> Originally committed as revision 26394 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xversion.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.sh b/version.sh
index f8510ea28c..f45c60daae 100755
--- a/version.sh
+++ b/version.sh
@@ -18,7 +18,7 @@ fi
# check for git short hash
if ! test $revision; then
- revision=$(cd "$1" && git log -1 --pretty=format:%h 2> /dev/null)
+ revision=$(cd "$1" && git describe --always 2> /dev/null)
test $revision && revision=git-$revision
fi