and also under linux if you don't have Change-Id, there is warning about this...
On Wed, Jan 18, 2017 at 4:09 PM, Paul Offord <paul.off...@advance7.com> wrote: > OK - I think I must have missed the git review -s step. I thought I'd > followed the instructions to the letter but I must admit that I don't > remember entering that particular command. > > -----Original Message----- > From: wireshark-dev-boun...@wireshark.org [mailto:wireshark-dev-bounces@ > wireshark.org] On Behalf Of João Valverde > Sent: 18 January 2017 14:34 > To: Developer support list for Wireshark <wireshark-dev@wireshark.org> > Subject: Re: [Wireshark-dev] git-review fails with an SSL error > > > > On 01/18/2017 11:04 AM, Graham Bloice wrote: > > > > > > On 17 January 2017 at 22:34, Paul Offord <paul.off...@advance7.com > > <mailto:paul.off...@advance7.com>> wrote: > > > > OK - it's done.____ > > > > __ __ > > > > Thanks for everyone's help.____ > > > > __ > > > > > > So there's something missing from the Developers Guide? > > > > I think we need to add instructions to: > > > > 1. Copy tools\pre-commit to .git\hooks\ 2. Copy tools\commit-msg to > > .git\hooks\ or possibly run `git-review > > -s`. I'm positive I did the latter. > > commit-msg hook is part of Gerrit (git review -s). pre-commit is wireshark > specific however (in the tools dir). > > > __ > > > > *From:*wireshark-dev-boun...@wireshark.org > > <mailto:wireshark-dev-boun...@wireshark.org> > > [mailto:wireshark-dev-boun...@wireshark.org > > <mailto:wireshark-dev-boun...@wireshark.org>] *On Behalf Of *Pascal > > Quantin > > *Sent:* 17 January 2017 22:19 > > > > > > *To:* Developer support list for Wireshark > > <wireshark-dev@wireshark.org <mailto:wireshark-dev@wireshark.org>> > > *Subject:* Re: [Wireshark-dev] git-review fails with an SSL > > error____ > > > > __ __ > > > > __ __ > > > > __ __ > > > > 2017-01-17 23:15 GMT+01:00 Paul Offord <paul.off...@advance7.com > > <mailto:paul.off...@advance7.com>>:____ > > > > I ran git-review -v and that caused a login dialogue box to > > appear. I entered by Gerrit userid and the HTTPS password. It > > got a bit further but now it's complaining that I don't have a > > Change-Id. I thought this is what git-review does for me.____ > > > > __ __ > > > > To get a Change-Id automatically inserted in your commit message, > > and benefit from the pre-commit hooks, simply copy tools/pre-commit > > and tools/commit-msg files in the .git/hooks folder of your > > Wireshark clone.____ > > > > Pascal.____ > > > > ____ > > > > I think this has me beat. If anyone wants to submit the fix for > > bug 12973 I'll happily provide the details.____ > > > > ____ > > > > Thanks to Graham and Pascal for the help.____ > > > > ____ > > > > *From:*wireshark-dev-boun...@wireshark.org > > <mailto:wireshark-dev-boun...@wireshark.org> > > [mailto:wireshark-dev-boun...@wireshark.org > > <mailto:wireshark-dev-boun...@wireshark.org>] *On Behalf Of > > *Graham Bloice > > *Sent:* 17 January 2017 18:47____ > > > > > > *To:* Developer support list for Wireshark > > <wireshark-dev@wireshark.org <mailto:wireshark-dev@wireshark.org > >> > > *Subject:* Re: [Wireshark-dev] git-review fails with an SSL > > error____ > > > > ____ > > > > ____ > > > > ____ > > > > On 17 January 2017 at 18:44, Paul Offord > > <paul.off...@advance7.com <mailto:paul.off...@advance7.com>> > > wrote:____ > > > > Re the Gerrit check:____ > > > > ____ > > > > C:\Development\wireshark>"C:\Program > > Files\Git\usr\bin\ssh.exe" -p 29418 > > pauloff...@code.wireshark.org > > <mailto:pauloff...@code.wireshark.org>____ > > > > Enter passphrase for key > > '/c/Users/xxxxxx/.ssh/id_rsa':____ > > > > ____ > > > > **** Welcome to Gerrit Code Review ****____ > > > > ____ > > > > Hi Paul Offord, you have successfully connected over > > SSH.____ > > > > ____ > > > > Unfortunately, interactive shells are disabled.____ > > > > To clone a hosted Git repository, use:____ > > > > ____ > > > > git clone > > > > ssh://pauloff...@code.wireshark.org:29418/REPOSITORY_NAME.git > > <http://pauloff...@code.wireshark.org:29418/REPOSITORY_NAME.git>____ > > > > ____ > > > > Connection to code.wireshark.org <http://code.wireshark.org> > > closed.____ > > > > ____ > > > > OK, looks good, now to see what the git-review -v gives. ____ > > > > ____ > > > > ____ > > > > *From:*wireshark-dev-boun...@wireshark.org > > <mailto:wireshark-dev-boun...@wireshark.org> > > [mailto:wireshark-dev-boun...@wireshark.org > > <mailto:wireshark-dev-boun...@wireshark.org>] *On Behalf Of > > *Paul Offord > > *Sent:* 17 January 2017 18:40____ > > > > > > *To:* Developer support list for Wireshark > > <wireshark-dev@wireshark.org > > <mailto:wireshark-dev@wireshark.org>> > > *Subject:* Re: [Wireshark-dev] git-review fails with an SSL > > error____ > > > > ____ > > > > Yep - it's master. I cloned master this morning and then > > created my own branch:____ > > > > ____ > > > > C:\Development\wireshark>git branch____ > > > > * bug12973____ > > > > master____ > > > > ____ > > > > ____ > > > > *From:*wireshark-dev-boun...@wireshark.org > > <mailto:wireshark-dev-boun...@wireshark.org> > > [mailto:wireshark-dev-boun...@wireshark.org > > <mailto:wireshark-dev-boun...@wireshark.org>] *On Behalf Of > > *Graham Bloice > > *Sent:* 17 January 2017 18:37 > > *To:* Developer support list for Wireshark > > <wireshark-dev@wireshark.org > > <mailto:wireshark-dev@wireshark.org>> > > *Subject:* Re: [Wireshark-dev] git-review fails with an SSL > > error____ > > > > ____ > > > > ____ > > > > ____ > > > > On 17 January 2017 at 18:32, Graham Bloice > > <graham.blo...@trihedral.com > > <mailto:graham.blo...@trihedral.com>> wrote:____ > > > > ____ > > > > ____ > > > > On 17 January 2017 at 18:04, Paul Offord > > <paul.off...@advance7.com > > <mailto:paul.off...@advance7.com>> wrote:____ > > > > I'm trying to get git-review working. I think I've > > done everything necessary but this is what I > > get:____ > > > > ____ > > > > C:\Development\wireshark>git status____ > > > > On branch bug12973____ > > > > Changes not staged for commit:____ > > > > (use "git add <file>..." to update what will be > > committed)____ > > > > (use "git checkout -- <file>..." to discard > > changes in working directory)____ > > > > ____ > > > > modified: ui/gtk/main_toolbar.c____ > > > > modified: ui/qt/main_window.cpp____ > > > > ____ > > > > no changes added to commit (use "git add" and/or > > "git commit -a")____ > > > > ____ > > > > C:\Development\wireshark>git commit -a____ > > > > [bug12973 98ee4f256a] Fix Access Violation in > > plugin_if_mainwindow_get_ws_info(...)____ > > > > 2 files changed, 2 insertions(+), 2 > > deletions(-)____ > > > > ____ > > > > C:\Development\wireshark>git review____ > > > > Problem running 'git remote update origin'____ > > > > Fetching origin____ > > > > fatal: unable to access > > 'https://code.wireshark.org/review/wireshark/ > > <https://code.wireshark.org/review/wireshark/>': > > Unknown SSL protocol error in connection to > > code.wireshark.org:443 > > <http://code.wireshark.org:443>____ > > > > error: Could not fetch origin____ > > > > ____ > > > > I'm not sure why I'm not using ssh as I have set > > this up and the recommended test works fine.____ > > > > ____ > > > > I got to similar position a couple of years ago and > > never got it working. I'm obviously doing something > > wrong as this is a completely fresh install of all > > involved packages.____ > > > > ____ > > > > I'm using:____ > > > > ____ > > > > * git version 2.11.0.windows.3____ > > * git-review version 1.25.0____ > > * Python 3.6.0____ > > > > ____ > > > > I've spent about 6 hours on this so far - just to > > push a stupid two line patch. Any advice gratefully > > accepted.____ > > > > ____ > > > > Thanks and regards.Paul____ > > > > ____ > > > > ____ > > > > ____ > > > > Could be several things, try adding a "-v" to git-review > > for more verbose output____ > > > > ____ > > > > Is it because you have checked out out a tag and not the > > master-2.2 branch? What does "git branch" show?____ > > > > ____ > > > > ____ > > > > I may have got confused here with your earlier request to > > get the 2.2.3 code. Which branch are you attempting to > > apply the change to, normally it should be master?____ > > > > ____ > > > > Have you checked your git\ssh connection to Gerrit? > > see https://wiki.wireshark.org/ > Development/SubmittingPatches/GitForWindows > > <https://wiki.wireshark.org/ > Development/SubmittingPatches/GitForWindows>, > > but note you'll need to supply the path to the git > > version of ssh, i.e. (from PowerShell)____ > > > > ____ > > > > & "C:\Program Files\Git\usr\bin\ssh.exe" -p 29418 > > yourgerritusern...@code.wireshark.org > > <mailto:yourgerritusern...@code.wireshark.org>____ > > > > ____ > > > > Pro-tip: On Windows use Powershell (although it's now > > available everywhere) and PoshGit (cinst -y poshgit in > > chocolatey) which adds some nice support for git to the > > shell. > > ____ > > > > ____ > > > > ____ > > > > > > > > ____ > > > > ____ > > > > -- ____ > > > > Graham Bloice____ > > > > > > > > ______________________________________________________________________ > > > > This message contains confidential information and is intended > > only for the individual named. If you are not the named > > addressee you should not disseminate, distribute or copy this > > e-mail. Please notify the sender immediately by e-mail if you > > have received this e-mail by mistake and delete this e-mail from > > your system. > > > > Any views or opinions expressed are solely those of the author > > and do not necessarily represent those of Advance Seven Ltd. > > E-mail transmission cannot be guaranteed to be secure or > > error-free as information could be intercepted, corrupted, lost, > > destroyed, arrive late or incomplete, or contain viruses. The > > sender therefore does not accept liability for any errors or > > omissions in the contents of this message, which arise as a > > result of e-mail transmission. > > > > Advance Seven Ltd. Registered in England & Wales numbered > > 2373877 at Endeavour House, Coopers End Lane, Stansted, Essex > > CM24 1SJ > > > > ____________________________________________________________ > __________ > > This email has been scanned by the Symantec Email Security.cloud > > service. > > For more information please visit http://www.symanteccloud.com > > > > ______________________________________________________________________ > > ____ > > > > > > ____________________________________________________________ > _______________ > > Sent via: Wireshark-dev mailing list > > <wireshark-dev@wireshark.org <mailto:wireshark-dev@wireshark.org > >> > > Archives: https://www.wireshark.org/lists/wireshark-dev > > <https://www.wireshark.org/lists/wireshark-dev> > > Unsubscribe: > > https://www.wireshark.org/mailman/options/wireshark-dev > > <https://www.wireshark.org/mailman/options/wireshark-dev> > > mailto:wireshark-dev-requ...@wireshark.org > > > > <mailto:wireshark-dev-requ...@wireshark.org>?subject=unsubscribe____ > > > > __ __ > > > > > > > > ______________________________________________________________________ > > > > This message contains confidential information and is intended only > > for the individual named. If you are not the named addressee you > > should not disseminate, distribute or copy this e-mail. Please > > notify the sender immediately by e-mail if you have received this > > e-mail by mistake and delete this e-mail from your system. > > > > Any views or opinions expressed are solely those of the author and > > do not necessarily represent those of Advance Seven Ltd. E-mail > > transmission cannot be guaranteed to be secure or error-free as > > information could be intercepted, corrupted, lost, destroyed, arrive > > late or incomplete, or contain viruses. The sender therefore does > > not accept liability for any errors or omissions in the contents of > > this message, which arise as a result of e-mail transmission. > > > > Advance Seven Ltd. Registered in England & Wales numbered 2373877 at > > Endeavour House, Coopers End Lane, Stansted, Essex CM24 1SJ > > > > ____________________________________________________________ > __________ > > This email has been scanned by the Symantec Email Security.cloud > > service. > > For more information please visit http://www.symanteccloud.com > > > > ______________________________________________________________________ > > > > ____________________________________________________________ > _______________ > > Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org > > <mailto:wireshark-dev@wireshark.org>> > > Archives: https://www.wireshark.org/lists/wireshark-dev > > <https://www.wireshark.org/lists/wireshark-dev> > > Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev > > <https://www.wireshark.org/mailman/options/wireshark-dev> > > mailto:wireshark-dev-requ...@wireshark.org > > <mailto:wireshark-dev-requ...@wireshark.org>?subject=unsubscribe > > > > > > > > > > -- > > Graham Bloice > > Software Developer > > Trihedral UK Limited > > > > > > ____________________________________________________________ > _______________ > > 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 > > > ____________________________________________________________ > _______________ > 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 > > ______________________________________________________________________ > > This message contains confidential information and is intended only for > the individual named. If you are not the named addressee you should not > disseminate, distribute or copy this e-mail. Please notify the sender > immediately by e-mail if you have received this e-mail by mistake and > delete this e-mail from your system. > > Any views or opinions expressed are solely those of the author and do not > necessarily represent those of Advance Seven Ltd. E-mail transmission > cannot be guaranteed to be secure or error-free as information could be > intercepted, corrupted, lost, destroyed, arrive late or incomplete, or > contain viruses. The sender therefore does not accept liability for any > errors or omissions in the contents of this message, which arise as a > result of e-mail transmission. > > Advance Seven Ltd. Registered in England & Wales numbered 2373877 at > Endeavour House, Coopers End Lane, Stansted, Essex CM24 1SJ > > ______________________________________________________________________ > This email has been scanned by the Symantec Email Security.cloud service. > For more information please visit http://www.symanteccloud.com > ______________________________________________________________________ > ____________________________________________________________ > _______________ > 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 >
___________________________________________________________________________ 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
