Hi Ole-san, Happy to hear you again. I will meet you at next IETF.
All commits were already completed on our different repository in GitHub. There is no in progress commit and so I don’t think I can use the squash…. I tried to do “git merge” from our repository to the “topic” branch based on gerrit.fd.io/vpp.git <http://gerrit.fd.io/vpp.git> repo. Even though adding the “Signed-off-by” statement for 3 committers in the merge commit, I could not solve the issue… There are a lot of commits happened on our different repository (roughly 100+) which was done by 3 contributors. I don’t think all commits happened on our different repo were signed off…. I think only way is to retrieve the change happened on our different repo and then apply it to the topic branch based on vpp.git repo. In this case, I can create the flattened commit but all past commit log could be gone…. So, I am asking if there is a way to make a flattened commit with keeping the past commit log. Thanks, Tetsuya > On Nov 5, 2019, at 1:52 PM, Ole Troan <otr...@employees.org> wrote: > > Dear Tetsuya, > > Long time no see! > > How many commits are we talking about here? > How many authors? > Are all commits signed off by the respective authors? > > Are these commits that when applied individually would pass verify the verify > jobs, or are they a mix of development in progress commits? > In the latter case you could squash it into one flattened commit, but keep > the commit messages and the signed-off-by fields for the individual commits. > > Best regards, > Ole > >> On 5 Nov 2019, at 20:52, Tetsuya Murakami <tetsuya....@gmail.com> wrote: >> >> Hi Dave, >> >> Thank you for your reply. >> >> We made a lot of change for SRv6 mobile on the different repository/branch. >> So, I merged al changes happened on the different repo/branch into my local >> vpp branch which was cloned from gerrit vpp repo. So, I guess this might not >> be a single, flattened commit…. Even though adding “Signed-off-by” statement >> in the merge commit, I could see the same error…. >> >> If possible, we would like to keep the commit history for SRv6 mobile. Do >> you have any idea how to merge the change from the different repo/branch >> into vpp for the review. >> >> Thanks, >> Tetsuya >> >>> On Nov 5, 2019, at 4:14 AM, Dave Barach (dbarach) <dbar...@cisco.com> wrote: >>> >>> Make sure that you’re pushing a single, flattened commit which you created. >>> Worst-case, ask Filip to push the patch. >>> >>> HTH... Dave >>> >>> From: Tetsuya Murakami <tetsuya....@gmail.com> >>> Sent: Monday, November 4, 2019 7:38 PM >>> To: Dave Barach (dbarach) <dbar...@cisco.com> >>> Cc: satoru.matsush...@gmail.com Satoru <satoru.matsush...@gmail.com>; >>> vpp-dev@lists.fd.io >>> Subject: Re: [vpp-dev] forge committer >>> >>> Hi Dave, >>> >>> Thank you. >>> >>> I tried but still I faced the following issue. When executing the “git >>> commit -s”, I added additional “Signed-off-by: <name> <email>” in the >>> commit log. But when doing the “git review”, still I am seeing the >>> following issue… >>> >>> remote: Processing changes: refs: 1, done >>> remote: WARNING: deprecated topic syntax. Use %topic=TOPIC instead >>> remote: ERROR: commit 3081564: email address filip.va...@pantheon.tech is >>> not registered in your account, and you lack 'forge committer' permission. >>> remote: The following addresses are currently registered: >>> remote: tetsuya....@gmail.com >>> remote: To register an email address, visit: >>> remote: https://gerrit.fd.io/r/settings#EmailAddresses >>> remote: >>> remote: >>> remote: Pushing to refs/publish/* is deprecated, use refs/for/* instead. >>> To ssh://gerrit.fd.io:29418/vpp >>> ! [remote rejected] HEAD -> refs/publish/master/srv6-mobile (commit >>> 3081564: invalid committer) >>> error: failed to push some refs to >>> 'ssh://tetsuyamurak...@gerrit.fd.io:29418/vpp’ >>> >>> Could you please let me know how to resolve the above issue? >>> >>> Thanks, >>> Tetsuya >>> >>> >>> On Nov 4, 2019, at 4:34 AM, Dave Barach via Lists.Fd.Io >>> <dbarach=cisco....@lists.fd.io> wrote: >>> >>> Please add folks as additional “Signed-off-by: <name><email>” lines in the >>> commit log. >>> >>> From: vpp-dev@lists.fd.io <vpp-dev@lists.fd.io> On Behalf Of Satoru >>> Sent: Saturday, November 2, 2019 10:21 PM >>> To: vpp-dev@lists.fd.io >>> Subject: [vpp-dev] forge committer >>> >>> Hello vpp-dev community, >>> >>> We are planning to contribute some plugin and PR to be reviewed in the vpp >>> gerrit. The PR includes commits from several people and would like to keep >>> the commit log. It seems that we need forge committer for the PR. So the >>> question here is where we can request to get forge commiter right? >>> >>> Best regards, >>> --satoru >>> -=-=-=-=-=-=-=-=-=-=-=- >>> Links: You receive all messages sent to this group. >>> >>> View/Reply Online (#14486): https://lists.fd.io/g/vpp-dev/message/14486 >>> Mute This Topic: https://lists.fd.io/mt/40833844/2600457 >>> Group Owner: vpp-dev+ow...@lists.fd.io >>> Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub [tetsuya....@gmail.com] >>> -=-=-=-=-=-=-=-=-=-=-=- >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> >> View/Reply Online (#14511): https://lists.fd.io/g/vpp-dev/message/14511 >> Mute This Topic: https://lists.fd.io/mt/40833844/675193 >> Group Owner: vpp-dev+ow...@lists.fd.io >> Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub [otr...@employees.org] >> -=-=-=-=-=-=-=-=-=-=-=- >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14513): https://lists.fd.io/g/vpp-dev/message/14513 Mute This Topic: https://lists.fd.io/mt/40833844/21656 Group Owner: vpp-dev+ow...@lists.fd.io Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
