[openstack-dev] Issues with "git review" for a dependent commit
Kyle Mestery (kmestery)
kmestery at cisco.com
Tue Jul 2 21:05:21 UTC 2013
On Jul 2, 2013, at 3:52 PM, Jeremy Stanley <fungi at yuggoth.org>
> On 2013-07-02 20:14:35 +0000 (+0000), Kyle Mestery (kmestery) wrote:
>> I'm trying to submit a gerrit review for a commit which is
>> dependent on another person's commit .
>> ! [remote rejected] HEAD -> refs/publish/master/bp/ml2-vxlan (no changes made)
> I want to say I've seen this recently when someone copy-pasted from
> one commit message to another and included an existing Change-Id
> header, so you might amend and clear that line from the top commit
> before reviewing again (it'll get regenerated fresh).
Thanks Jeremy, this was it! For some reason, the top commit had the
same Change-ID as the bottom commit. Once I cleared it, I was able to
push, though with the issue seen here:
[kmestery at fedora-mac quantum]$ git review -R
You have more than one commit that you are about to submit.
The outstanding commits are:
6cca2cf (HEAD, bp/ml2-vxlan) Add VXLAN tunneling support for the ML2 plugin
91e0850 Add gre tunneling support for the ML2 plugin
Is this really what you meant to do?
Type 'yes' to confirm: yes
Enter passphrase for key '/home/kmestery/.ssh/id_rsa':
remote: Resolving deltas: 100% (32/32)
remote: Processing changes: new: 1, updated: 1, refs: 1, done
remote: New Changes:
! [remote rejected] HEAD -> refs/publish/master/bp/ml2-vxlan (no changes made)
error: failed to push some refs to 'ssh://email@example.com:29418/openstack/quantum.git'
[kmestery at fedora-mac quantum]$
In addition, my commit seen at the review URL above does not show
the dependancy. Any ideas now?
> If that doesn't work, could you push your working branch to
> somewhere I could pull from so I can test it myself? Feel free to
> follow up with me in private or open a bug against git-review on
> Launchpad if you don't want to run through troubleshooting
> back-and-forth on the list.o
More information about the OpenStack-dev