summaryrefslogtreecommitdiff
path: root/editcap.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-02-07 11:14:52 -0800
committerGerald Combs <gerald@wireshark.org>2014-02-07 23:03:03 +0000
commitf966980937abd4899a9c43329041bb00798ab18e (patch)
treee31210350fa778765b6d2d4711fc5cc6c27f2aae /editcap.c
parent217f9fd0d9f2d6a9084da3fc945cce001414eea3 (diff)
downloadwireshark-f966980937abd4899a9c43329041bb00798ab18e.tar.gz
Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'editcap.c')
-rw-r--r--editcap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/editcap.c b/editcap.c
index 8c8cee9fb4..48a1ab40aa 100644
--- a/editcap.c
+++ b/editcap.c
@@ -82,7 +82,7 @@
#include <wsutil/md5.h>
#include <wsutil/plugins.h>
-#include "svnversion.h"
+#include "version.h"
#include "ringbuffer.h" /* For RINGBUFFER_MAX_NUM_FILES */
@@ -676,8 +676,8 @@ usage(gboolean is_error)
output = stderr;
fprintf(output, "Editcap %s"
-#ifdef SVNVERSION
- " (" SVNVERSION " from " SVNPATH ")"
+#ifdef GITVERSION
+ " (" GITVERSION " from " GITBRANCH ")"
#endif
"\n", VERSION);
fprintf(output, "Edit and/or translate the format of capture files.\n");