URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=42380cf285fd71855cc8dfda8e54f4ed8f2a9d21
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
42380cf by Peter Wu (peter@xxxxxxxxxxxxx):
make-version.pl: no need for git-ls-remote
In subversion, the URL was needed to find the branch. This is not needed
for git where a 'git branch' command suffices.
Remove the unused URL handling from git, this fixes a warning during
cmake on RHEL6 and avoids a fallback to SVN:
Version configuration file version.conf not found. Using defaults.
usage: git ls-remote [--heads] [--tags] [-u <exec> | --upload-pack <exec>] <repository> <refs>...
Unable to open ./.svn/entries
#define VCSVERSION "v2.1.0rc0-69-g2eb7e87"
#define VCSBRANCH "master"
Print the SVN warning to stderr, this avoids a compilation failure due
to a syntax error in version.h.
Change-Id: Idb28e74b7a9bf592686b45349cf5e81f85f6c358
Reviewed-on: https://code.wireshark.org/review/11041
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
(cherry picked from commit 1868dce4dee2ccfbb5ab3a60f88c192508b8ea13)
Reviewed-on: https://code.wireshark.org/review/14957
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 627f57a Don't fallback to thinking we have SVN; say Git if we didn't find a VCS.
adds 42380cf make-version.pl: no need for git-ls-remote
Summary of changes:
make-version.pl | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)