A quick follow up to this. There is a misalignment of cloning instructions between the notes in section 2.2.10. Install and Prepare Sources on 2.2. Win32/64: Step-by-Step Guide (wireshark.org) <https://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html> and 3.4. Obtaining The Wireshark Sources <https://www.wireshark.org/docs/wsdg_html_chunked/ChSrcObtain.html#ChSrcGit> .
On Sun, Feb 7, 2021 at 12:41 PM Paul Offord <paul.offor...@gmail.com> wrote: > Thanks Graham, > > You are quite right. > > Best regards...Paul > > On Sun, Feb 7, 2021 at 11:53 AM Graham Bloice <graham.blo...@trihedral.com> > wrote: > >> >> On Sun, 7 Feb 2021 at 11:03, Paul Offord <paul.offor...@gmail.com> wrote: >> >>> Hi, >>> >>> I'm following the instructions here - 3.10. Contribute Your Changes >>> (wireshark.org) >>> <https://www.wireshark.org/docs/wsdg_html_chunked/ChSrcContribute.html> >>> >>> There is an instruction to double check my remotes: >>> >>> $ git remote -v >>> $ downstream g...@gitlab.com:henry.perry/wireshark.git (fetch) >>> $ downstream g...@gitlab.com:henry.perry/wireshark.git (push) >>> $ upstream g...@gitlab.com:wireshark/wireshark.git (fetch) >>> $ upstream g...@gitlab.com:wireshark/wireshark.git (push) >>> >>> But when I run the command I get: >>> >>> C:\Development\wireshark>git remote -v >>> downstream g...@gitlab.com:paul.offord/wireshark.git (fetch) >>> downstream g...@gitlab.com:paul.offord/wireshark.git (push) >>> origin https://gitlab.com/wireshark/wireshark.git (fetch) >>> origin https://gitlab.com/wireshark/wireshark.git (push) >>> >>> As you can see, the master name is different. >>> >>> Is this a problem? >>> >>> >> The name given to any remote is just that, a local name to refer to. >> Origin is the default if you didn't provide one when cloning the Wireshark >> repo, presumably you didn't follow the instructions in >> https://www.wireshark.org/docs/wsdg_html_chunked/ChSrcObtain.html#ChSrcGit >> closely enough that are (my bold): >> >> 3. Next, clone the Wireshark repository: >>> >> >> >> # If you have a GitLab account, you can use the SSH URL: >>> $ git clone -o upstream g...@gitlab.com:wireshark/wireshark.git >>> # If you don't you can use the HTTPS URL: >>> $ git clone -o upstream https://gitlab.com/wireshark/wireshark.git >>> >> >> >> The clone only has to be done once. This will copy all the sources >>> (including directories) from the server to your machine and check out the >>> latest version. *The -o upstream flag uses the origin name “upstream” >>> for the repository instead of the default “origin” as described in >>> the GitLab documentation >>> <https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html>*. >>> Cloning may take some time depending on the speed of your internet >>> connection. >> >> >> You can adjust this using git remote: >> >> git remote rename origin upstream >> >> >> >>> Thanks and regards...Paul >>> >>> -- >>> >>> Paul Offord >>> >> >> -- >> Graham Bloice >> >> ___________________________________________________________________________ >> Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> >> Archives: https://www.wireshark.org/lists/wireshark-dev >> Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev >> mailto:wireshark-dev-requ...@wireshark.org >> ?subject=unsubscribe > > > > -- > > Paul Offord > -- Paul Offord
___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> Archives: https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
