URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f966980937abd4899a9c43329041bb00798ab18e
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
f966980 by Gerald Combs (gerald@xxxxxxxxxxxxx):
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@xxxxxxxxxxxxx>
Actions performed:
from 217f9fd Fix Bug 9728 'Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be'
adds f966980 Replace "svn" with "git" all over the place.
Summary of changes:
.gitignore | 2 +-
CMakeLists.txt | 39 +++++++-------
Makefile.am | 6 +--
Makefile.common | 6 +--
Makefile.nmake | 29 +++++-----
capinfos.c | 6 +--
captype.c | 6 +--
config.nmake | 8 +--
doc/README.packaging | 2 +-
docbook/check_git_version.sh | 16 +++---
dumpcap.c | 10 ++--
echld/dispatcher.c | 4 +-
editcap.c | 6 +--
epan/CMakeLists.txt | 2 +-
file.c | 2 +-
make-version.pl | 122 ++++++++++++++++++++++--------------------
mergecap.c | 6 +--
rawshark.c | 6 +--
reordercap.c | 8 +--
text2pcap.c | 10 ++--
tfshark.c | 10 ++--
tools/checklicenses.py | 2 +-
tshark.c | 12 ++---
ui/gtk/about_dlg.c | 2 +-
ui/gtk/file_import_dlg.c | 2 +-
ui/gtk/follow_stream.c | 2 +-
ui/gtk/main.c | 8 +--
ui/gtk/main_titlebar.c | 2 +-
ui/gtk/main_welcome.c | 2 +-
ui/gtk/summary_dlg.c | 2 +-
ui/qt/about_dialog.cpp | 2 +-
ui/qt/main.cpp | 8 +--
ui/qt/summary_dialog.cpp | 2 +-
ui/tap_export_pdu.c | 2 +-
version_info.c | 12 ++---
version_info.h | 4 +-
36 files changed, 191 insertions(+), 179 deletions(-)