[x264-devel] commit: Make version.sh indicate "M" for local commits too ( Anton Mitrofanov )

git at videolan.org git at videolan.org
Wed Jun 9 18:39:07 CEST 2010


x264 | branch: master | Anton Mitrofanov <BugMaster at narod.ru> | Tue Jun  8 01:03:03 2010 +0400| [c19a0ec45c507063892541bf054d9b09eb4902d0] | committer: Jason Garrett-Glaser 

Make version.sh indicate "M" for local commits too

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=c19a0ec45c507063892541bf054d9b09eb4902d0
---

 version.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/version.sh b/version.sh
index b777209..7f06c7c 100755
--- a/version.sh
+++ b/version.sh
@@ -5,7 +5,8 @@ if [ $LOCALVER \> 1 ] ; then
     VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
     if [ $VER != $LOCALVER ] ; then
         VER="$VER+$(($LOCALVER-$VER))"
-    elif git status | grep -q "modified:" ; then
+    fi
+    if git status | grep -q "modified:" ; then
         VER="${VER}M"
     fi
     VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"



More information about the x264-devel mailing list