From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 25 Jan 2011 19:08:13 +0000 (-0500)
Subject: Simplest fix to bug2402: do not include SVN versions
X-Git-Tag: tor-0.2.1.30~3^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1073ee956021ead19d30c2151510dbaced416a8;p=thirdparty%2Ftor.git

Simplest fix to bug2402: do not include SVN versions

When we stopped using svn, 0.2.1.x lost the ability to notice its svn
revision and report it in the version number.  However, it kept
looking at the micro-revision.i file... so if you switched to master,
built tor, then switched to 0.2.1.x, you'd get a micro-revision.i file
from master reported as an SVN tag.  This patch takes out the "include
the svn tag" logic entirely.

Bugfix on 0.2.1.15-rc; fixes bug 2402.
---

diff --git a/changes/bug2402 b/changes/bug2402
new file mode 100644
index 0000000000..f16f6773e7
--- /dev/null
+++ b/changes/bug2402
@@ -0,0 +1,4 @@
+  o Minor bugfixes (build)
+    - Do not include Git version tags as though they were SVN tags when
+      generating a tarball from inside a repository that has switched between
+      branches.  Bugfix on 0.2.1.15-rc; fixes bug 2402.
diff --git a/src/or/config.c b/src/or/config.c
index f8cfd29f84..c5d654078e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -827,16 +827,7 @@ static char *_version = NULL;
 const char *
 get_version(void)
 {
-  if (_version == NULL) {
-    if (strlen(tor_svn_revision)) {
-      size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8;
-      _version = tor_malloc(len);
-      tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision);
-    } else {
-      _version = tor_strdup(VERSION);
-    }
-  }
-  return _version;
+  return VERSION;
 }
 
 /** Release additional memory allocated in options