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 /echld | |
| 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 'echld')
| -rw-r--r-- | echld/dispatcher.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/echld/dispatcher.c b/echld/dispatcher.c index 531abe46ba..373bd88a5e 100644 --- a/echld/dispatcher.c +++ b/echld/dispatcher.c @@ -489,7 +489,7 @@ static void preinit_epan(char* argv0, int (*main)(int, char **)) { get_runtime_version_info(runtime_info_str, NULL); version_long_str = g_strdup_printf("%s%s\n%s\n%s\n%s", - version_str, wireshark_svnversion, get_copyright_info(), + version_str, wireshark_gitversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); if (error) { @@ -498,7 +498,7 @@ static void preinit_epan(char* argv0, int (*main)(int, char **)) { /* Add it to the information to be reported on a crash. */ ws_add_crash_info("Echld " VERSION "%s\n%s\n%s", - wireshark_svnversion, comp_info_str->str, runtime_info_str->str); + wireshark_gitversion, comp_info_str->str, runtime_info_str->str); init_stuff(); |