Hi Paul You have a merge branch in between two syncro branches. That happens, when you are not working cleanly of branches, but instead pull changes into the master branch.
Take a look at git log You should see your Syncro at the top, then a merge-branch and then again a syncro at the bottom. The issue here is, that you have not rebased cleanly on top of master after pulling the patchset fix, or that you have pulled the master into your syncro branch. Both things are bad. There is a rather annoying step you have to do, and I suggest you do that with a graphical tool like "GitExtensions". * Rename the review/unknown/syncro branch to something else (call it temp for instance) * Remove it (your work is stored in temp) * Checkout master locally * Recheckout your last patchset (creating again the branch review/unknown/syncro) * Now make a diff compare between your temp and the new syncro to import your new stuff * make a "git commit --amend" in the syncro branch * make a "git review" to upload the new patchset This will solve it for you cheers Roland On Wed, Jul 5, 2017 at 1:47 PM, Paul Offord <[email protected]> wrote: > Hi, > > > > I’m struggling with git again. I want to submit a new patch set for > change 19666 - https://code.wireshark.org/review/#/c/19666/ > > > > When I try 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: > > > > [33m519336c915[m[33m ([m[1;36mHEAD -> [m[1;32mreview/unknown/syncro[m[33m)[m > Syncro: Program access to plugin_if via TCP > > [33m25c72c3a24[m Merge branch 'master' of https://code.wireshark.org/ > review/wireshark into review/unknown/syncro > > [33m5854989e62[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]: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' > > > > It says the Change-Id is missing but that’s not true because if I check > with git –amend I get: > > > > Syncro: Program access to plugin_if via TCP > > > > Extensive re-write of the code. The C++ Qt code now > > only handles the TCP server component. All other code is written > > in C. > > > > 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: Tue Jul 4 22:41:41 2017 +0100 > > . > > . > > > > Sorry to keep bothering the list with repeated git questions, it’s just > that I have spent more than an hour trying to overcome this. > > > > 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]> > Archives: https://www.wireshark.org/lists/wireshark-dev > Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev > mailto:[email protected]?subject= > unsubscribe >
___________________________________________________________________________ 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
