Wireshark · Wireshark-dev: Re: [Wireshark-dev] Failing to push to gerrit

[Pascal Quantin <pascal.quantin@xxxxxxxxx>]

Le 8 sept. 2014 00:52, "Martin Mathieson" <martin.r.mathieson@xxxxxxxxxxxxxx> a écrit :
>
> I hadn't updated git-review since I first installed it, but running
>
> $ pip install -U git-review
> Requirement already up-to-date: git-review in c:\python27\lib\site-packages
> Cleaning up...
>
> showed that I was apparently already at the latest version.
>
> Further attempts to amend the last commit haven't helped.  I did notice that somehow I had 2 spaces after "Change-Id:" whereas the recommended message only had 1.
>
>
> In case someone can see something, here is my currently commit comment and the attempt to push (without using git-commit).  This is from my master branch, as I accidentally committed my changes there (as sometimes happens).
>
> mmathie2@mmathie2-WS /cygdrive/c/wireshark-git
> $ git push ssh://martinm@xxxxxxxxxxxxxxxxxx:29418/wireshark HEAD:refs/for/master/ue_caps_show_bands
> remote: Resolving deltas: 100% (16/16)
> remote: Processing changes: refs: 1, done
> remote: ERROR: missing Change-Id in commit message footer
> remote: Suggestion for commit message:
> remote: Merge branch 'master' of ssh://code.wireshark.org:29418/wireshark
> remote:
> remote: Change-Id: Ie60dc73e40a2ac1d80197fa712075ccff83cf797
> remote:
> remote: Hint: To automatically insert Change-Id, install the hook:
> remote:   gitdir=$(git rev-parse --git-dir); scp -p -P 29418 martinm@xxxxxxxxxxxxxxxxxx:hooks/commit-msg ${gitdir}/hooks/
> remote:
> remote:
> To ssh://martinm@xxxxxxxxxxxxxxxxxx:29418/wireshark
>  ! [remote rejected] HEAD -> refs/for/master/ue_caps_show_bands (missing Change-Id in commit message footer)
> error: failed to push some refs to 'ssh://martinm@xxxxxxxxxxxxxxxxxx:29418/wireshark'
>
> mmathie2@mmathie2-WS /cygdrive/c/wireshark-git
> $ git log -1
> commit f4665be2e5fa30d7500f4b15109053979180efc0
> Author: Martin Mathieson <martin.r.mathieson@xxxxxxxxxxxxxx>
> Date:   Sun Sep 7 23:45:08 2014 +0100
>
>     Trying to get footer right...
>
>     Change-Id: Ie60dc73e40a2ac1d80197fa712075ccff83cf797
>
> mmathie2@mmathie2-WS /cygdrive/c/wireshark-git
> $
>
>
> Thanks,
> Martin
>
Hi Martin,

Does 'git status' tell you that you have only 1 commit ahead of the origin? Because as you committed directly in master, you might have a merge commit lying around created if you updated without rebasing. 'git push' command will try to send all changesets not known in origin.

Pascal.

>
> On Fri, Sep 5, 2014 at 7:53 PM, Guy Harris <guy@xxxxxxxxxxxx> wrote:
>>
>>
>> On Sep 5, 2014, at 11:15 AM, Martin Mathieson <martin.r.mathieson@xxxxxxxxxxxxxx> wrote:
>>
>> > Its been a while since I last pushed any changes, am now failing and don't know why.
>> >
>> > 'git review' is no longer working on this machine,
>>
>> For what it's worth, a while ago, I took git-review's
>>
>>         ***********************************************************
>>         A new version of git-review is available on PyPI. Please
>>         update your copy with:
>>
>>           pip install -U git-review
>>
>>         to ensure proper behavior with gerrit. Thanks!
>>         ***********************************************************
>>
>> message seriously and proceeded to install a version of git-review that didn't work, failing with a Python stack trace.  Reverting to the older version fixed the problem.
>>
>> I don't know whether that's the problem you're having; did you upgrade git-review recently?
>> ___________________________________________________________________________
>> Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
>> Archives:    http://www.wireshark.org/lists/wireshark-dev
>> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>>              mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe
>
>
>
> ___________________________________________________________________________
> Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> Archives:    http://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>              mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe