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 /rawshark.c | |
| parent | 217f9fd0d9f2d6a9084da3fc945cce001414eea3 (diff) | |
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 'rawshark.c')
| -rw-r--r-- | rawshark.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rawshark.c b/rawshark.c index 091319324e..c7f049e07c 100644 --- a/rawshark.c +++ b/rawshark.c @@ -195,7 +195,7 @@ print_usage(gboolean print_ver) "See http://www.wireshark.org for more information.\n" "\n" "%s", - wireshark_svnversion, get_copyright_info()); + wireshark_gitversion, get_copyright_info()); } else { output = stderr; } @@ -435,7 +435,7 @@ show_version(GString *comp_info_str, GString *runtime_info_str) "%s" "\n" "%s", - wireshark_svnversion, get_copyright_info(), comp_info_str->str, + wireshark_gitversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); } @@ -486,7 +486,7 @@ main(int argc, char *argv[]) "%s" "\n" "%s", - wireshark_svnversion, comp_info_str->str, runtime_info_str->str); + wireshark_gitversion, comp_info_str->str, runtime_info_str->str); #ifdef _WIN32 arg_list_utf_16to8(argc, argv); |