Hi Roland,
I did reply through Gerrit a few weeks ago but I didn't realise that the
feedback doesn't automatically get Posted.
Anyway, I've updated all the comments and posted.
Nest regards...Paul
Sent from Samsung Mobile on O2
-------- Original message --------
From: Roland Knall <[email protected]>
Date: 25/06/2017 14:45 (GMT+00:00)
To: Developer support list for Wireshark <[email protected]>
Subject: Re: [Wireshark-dev] git problem
Hi Paul
Please cover the questions directly in the patchset's comments. You can
directly reply on a comment in Gerrit, and afterwards simply reply on the
patchset itself to get them committed. It makes it easier to keep all the
comments in one place and figure out their meaning.
cheers,
Roland
On Sun, Jun 25, 2017 at 3:24 PM, Paul Offord
<[email protected]<mailto:[email protected]>> wrote:
Thanks Pascal and Roland,
The instructions below worked. My local branch is review/unknown/syncro.
Anyway, the new Patch Set is now on Gerrit.
Roland,
I still have more work to do to cover all of the changes you requested. I have
a couple of questions regarding your comments but I’ll cover those in another
email.
Best regards…Paul
From: Wireshark-dev
[mailto:[email protected]<mailto:[email protected]>]
On Behalf Of Roland Knall
Sent: 25 June 2017 12:26
To: Developer support list for Wireshark
<[email protected]<mailto:[email protected]>>
Subject: Re: [Wireshark-dev] git problem
Hi Paul
Please review the following link:
https://www.mediawiki.org/wiki/Gerrit/Getting_started
It seems especially the last section is your issue. You've to start from an
empty master:
> git pull
then download the original patchiest, if you have not kept a branch with the
change:
> git review -d 19666
After that step, you change the code as you normally would, and finish with
> git commit --add --amend
At this point you've got a local branch called "review/paul_offord/syncro" and
you can upload this with the command
> git review
If you follow these steps, you should be able to upload a complete new patchset
in the same change, which is the way to go. If you need to rebase to new
changes in the master branch, please simple after the "git review -d 19666"
step rebase to master with
> git rebase master
Cheers,
Roland
On Sun, Jun 25, 2017 at 1:12 PM, Pascal Quantin
<[email protected]<mailto:[email protected]>> wrote:
Hi Paul,
Le 25 juin 2017 12:59, "Paul Offord"
<[email protected]<mailto:[email protected]>> a écrit :
I am trying to upload some patches to Gerrit. The start of my commit message
looks like this:
[WIP] First stage of updates to Syncro
This patch set deals with several of the issues raised by
Roland Knall after he checked through the first submission.
This is still a work in progress.
Change-Id: I05e96a3efdfed13bf779fecde6677aa9f0a0c12c
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Sun Jun 25 11:06:29 2017 +0100
#
# On branch syncro
# Changes to be committed:
# renamed: plugins/syncro/Makefile.common -> CMakeListsCustom.txt
# modified: plugins/syncro/AUTHORS
# modified: plugins/syncro/CMakeLists.txt
# deleted: plugins/syncro/ChangeLog
# deleted: plugins/syncro/INSTALL
# modified: plugins/syncro/Makefile.am
Whenever I run git review I get:
---------------------------------
C:\Development\wireshark>git review
You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.
The outstanding commits are:
[33m45a9bc4d34[m[33m ([m[1;36mHEAD -> [m[1;32msyncro[m[33m)[m [WIP] First stage
of updates to Syncro
[33mc290e9d0ea[m Merge commit 'refs/changes/66/19666/1' of
https://code.wireshark.org/review/a/wireshark into syncro
[33m74f8865d67[m Syncro: Program access to plugin_if via TCP
Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: yes
remote: Processing changes: refs: 1, done
remote: ERROR: missing Change-Id in commit message footer
remote:
remote: Hint: To automatically insert Change-Id, install the hook:
remote: gitdir=$(git rev-parse --git-dir); scp -p -P 29418
[email protected]<mailto:[email protected]>:hooks/commit-msg
${gitdir}/hooks/
remote: And then amend the commit:
remote: git commit --amend
remote:
To https://code.wireshark.org/review/wireshark
! [remote rejected] HEAD -> refs/publish/master/syncro (missing Change-Id
in commit message footer)
error: failed to push some refs to 'https://code.wireshark.org/review/wireshark'
I’ve got the commit-msg hook installed and I’ve tried the git review with and
without it – I get the same result.
There are three things:
* I added the Change-Id to the commit message with no blank line after it,
and yet when I save it and run commit amend again a blank line has been
inserted. Why is this?
* Why do I get unprintable characters in the git review output?
Because your she'll does not seem to support color output. Nothing to worry
about.
*
* Why is the change being rejected? The commit message has the correct
Change-Id.
Because you have a merge changeset that does not include and change-id.
You should get it of rid and your new changes should be part of the initial
changeset (that you can update with the 'git commit --ammend' command).
*
I’m getting pretty frustrated with this and so any help would be much
appreciated.
Thanks and regards…Paul
______________________________________________________________________
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
<[email protected]<mailto:[email protected]>>
Archives: https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
mailto:[email protected]<mailto:[email protected]>?subject=unsubscribe
___________________________________________________________________________
Sent via: Wireshark-dev mailing list
<[email protected]<mailto:[email protected]>>
Archives: https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
mailto:[email protected]<mailto:[email protected]>?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
<[email protected]<mailto:[email protected]>>
Archives: https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
mailto:[email protected]<mailto:[email protected]>?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 <[email protected]>
Archives: https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
mailto:[email protected]?subject=unsubscribe
