Author: cazfi
Date: Thu Apr 27 19:19:55 2017
New Revision: 35308

URL: http://svn.gna.org/viewcvs/freeciv?rev=35308&view=rev
Log:
Use short git revision identifier in version numbers

See hrm Feature #655305

Modified:
    trunk/bootstrap/generate_gitrev.sh
    trunk/fc_version

Modified: trunk/bootstrap/generate_gitrev.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/generate_gitrev.sh?rev=35308&r1=35307&r2=35308&view=diff
==============================================================================
--- trunk/bootstrap/generate_gitrev.sh  (original)
+++ trunk/bootstrap/generate_gitrev.sh  Thu Apr 27 19:19:55 2017
@@ -23,7 +23,7 @@
  # If not, we will not claim to know which git revision this is
  # (REVSTATE will be OFF)
  if which git && which tail && which wc ; then
-   REVTMP="$(git rev-parse HEAD 2>/dev/null)"
+   REVTMP="$(git rev-parse --short HEAD 2>/dev/null)"
    if test "x$REVTMP" != "x" ; then
      # This is git repository. Check for local modifications
      if test $(cd "$SRCROOT" ; git diff | wc -l) -eq 0 ; then

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=35308&r1=35307&r2=35308&view=diff
==============================================================================
--- trunk/fc_version    (original)
+++ trunk/fc_version    Thu Apr 27 19:19:55 2017
@@ -68,7 +68,7 @@
 if test x$VERSION_REVTYPE = xsvn && which svn > /dev/null ; then
   VERSION_REV="r$(LANG=C svn info 2>/dev/null | grep "^Revision: " | sed 
's/^Revision: //')"
 elif test x$VERSION_REVTYPE = xgit && which git > /dev/null ; then
-  VERSION_REV="$(git rev-parse HEAD)"
+  VERSION_REV="$(git rev-parse --short HEAD)"
 else
   VERSION_REV=""
 fi


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to