diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-02-07 11:14:52 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-02-07 23:03:03 +0000 |
commit | f966980937abd4899a9c43329041bb00798ab18e (patch) | |
tree | e31210350fa778765b6d2d4711fc5cc6c27f2aae /capinfos.c | |
parent | 217f9fd0d9f2d6a9084da3fc945cce001414eea3 (diff) | |
download | wireshark-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 'capinfos.c')
-rw-r--r-- | capinfos.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/capinfos.c b/capinfos.c index c3de1f7416..0a600a08b4 100644 --- a/capinfos.c +++ b/capinfos.c @@ -100,7 +100,7 @@ #include <wsutil/unicode-utils.h> #endif /* _WIN32 */ -#include "svnversion.h" +#include "version.h" /* * By default capinfos now continues processing @@ -1005,8 +1005,8 @@ usage(gboolean is_error) } fprintf(output, "Capinfos %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n", VERSION); fprintf(output, "Prints various information (infos) about capture files.\n"); |