[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [cdt-dev] Gerrit rejecting my commit
|
You can actually push multiple commits to Gerrit in a sequence; they don’t just have to be single commits. However if the WIP is not intended for final consumption then yes, you should squash it.
The problem was that you had the same Change-Id in the two commits. In Gerrit, each commit is its own review (and thus, own Change-Id). You can’t therefore have multiple commits with the same Change-Id header.
Alex
On 4 Apr 2014, at 13:55, Simon Taddiken <simon.taddiken@xxxxxxxxxxxxxx> wrote:
> Thank you, that did the trick.
>
> Greetings,
> Simon
>
> On 04.04.2014 14:48, Corbat Thomas wrote:
>> Hi Simon
>>
>> I guess you can only use a single commit, when using gerrit. So you need to merge your two commits to one and then amend the previous commit before pushing it to gerrit.
>>
>> Regards
>> Thomas
>>
>> -----Original Message-----
>> From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf Of Simon Taddiken
>> Sent: Freitag, 4. April 2014 14:32
>> To: 'CDT DEV (cdt-dev@xxxxxxxxxxx)'
>> Subject: [cdt-dev] Gerrit rejecting my commit
>>
>> Hi,
>>
>> sorry, this might be a stupid problem but I'm a little bit overchallenged with gerrit.
>> I would like to commit some changes but it keeps rejecting my commits.
>> There are two commits in my local branch, both signed of, both with identical change-id. The branch is rebased to the latest master.
>>
>> I'm using SmartGit and it displays the following response from the server:
>>
>> remote: Resolving deltas: 100% (109/109)
>> remote:
>> remote: Processing changes: refs: 1
>> remote: Processing changes: refs: 1, done
>> remote: ----------
>> remote: Reviewing commit: commit
>> 858a8883764bee64d8428634dc1b9d2c6b32f338 1396613881 ----sp
>> remote: Authored by: staddiken <simon.taddiken@xxxxxxxxx>
>> remote:
>> remote: The author is not a committer on the project.
>> remote: The author has a current Contributor License Agreement (CLA) on file.
>> remote: The author has "signed-off" on the contribution.
>> remote:
>> remote: This commit passes Eclipse validation.
>> remote: ----------
>> remote: Reviewing commit: commit
>> c8dcca626f6ad0accc2ee8551a6f6a65334b5403 1396613882 ----sp
>> remote: Authored by: staddiken <simon.taddiken@xxxxxxxxx>
>> remote:
>> remote: The author is not a committer on the project.
>> remote: The author has a current Contributor License Agreement (CLA) on file.
>> remote: The author has "signed-off" on the contribution.
>> remote:
>> remote: This commit passes Eclipse validation.
>> error: failed to push some refs to
>> 'https://git.eclipse.org/r/cdt/org.eclipse.cdt.git'
>>
>> I attached a screenshot of my local history. The commit "[WIP] ..." has already been pushed to gerrit by me some weeks ago. I now want to put my latest work on top of it.
>>
>> --
>> Gruß
>> Simon
>> _______________________________________________
>> cdt-dev mailing list
>> cdt-dev@xxxxxxxxxxx
>> https://dev.eclipse.org/mailman/listinfo/cdt-dev
>>
> _______________________________________________
> cdt-dev mailing list
> cdt-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/cdt-dev
