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 /text2pcap.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 'text2pcap.c')
| -rw-r--r-- | text2pcap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/text2pcap.c b/text2pcap.c index 8ea0223f84..95be74de8c 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -135,7 +135,7 @@ #include "pcapio.h" #include "text2pcap.h" -#include "svnversion.h" +#include "version.h" #ifdef _WIN32 #include <wsutil/unicode-utils.h> @@ -888,8 +888,8 @@ write_file_header (void) gboolean success; if (use_pcapng) { -#ifdef SVNVERSION - const char *appname = "text2pcap (" SVNVERSION " from " SVNPATH ")"; +#ifdef GITVERSION + const char *appname = "text2pcap (" GITVERSION " from " GITBRANCH ")"; #else const char *appname = "text2pcap"; #endif @@ -1387,8 +1387,8 @@ usage (gboolean is_error) fprintf(output, "Text2pcap %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n" "Generate a capture file from an ASCII hexdump of packets.\n" |