[git-users] Re: Proper steps to pick a fix from kernel.org

2014-03-10 Thread Thomas Ferris Nicolaisen


On Monday, March 10, 2014 5:08:32 AM UTC+1, Chin wrote:

 hi,
 I am a newbie in using *git*. So any help in the right direction would 
 help a lot.

 I am working on an issue, on my local repository, and I found that this 
 bug was fixed in the kernel.org repository.
 So now i am trying to pull in (cherry-pick) this fix (commit-id) from the 
 kernel.org branch and submit it to my local gerrit. And I am trying to 
 maintain the commit message of the commit from kernel.org branch.
 When i try to push this fix on my local gerrit, i face the following error:
 Error:
 To ssh://username@123.321.12.1:1234/mirror-sec/asdfgt/hjks
  ! [remote rejected] *branch* - refs/for/*branch* (not Signed-off-by 
 author/committer/uploader in commit message footer)
 error: failed to push some refs to 
 'ssh://username@123.321.12.1:1234/mirror-sec/asdfgt/hjks'


I reckon Gerrit is configured to reject commits that are not properly 
signed 
off: 
https://gerrit-documentation.storage.googleapis.com/Documentation/2.8.1/error-not-signed-off-by.html

I think any cherry-pick commit you make is essentially a new commit which 
just happens to have similar contents to the commit you are cherry-picking. 
Hence, the sign-off is invalid, and the commit will have to be re-signed in 
order for it to be accepted.

So, you either have to sign it off yourself, or remove the Signed-off-by 
line from the commit message. OR you just force your way past Gerrit's 
policy here according to said documentation.

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[git-users] Re: Proper steps to pick a fix from kernel.org

2014-03-10 Thread Chin
Hi Thomas,

Thank you very much for the feedback.
I removed the existing Signed-off information from the commit message and 
it works.

Thanks again.

On Monday, March 10, 2014 1:06:32 AM UTC-7, Thomas Ferris Nicolaisen wrote:



 On Monday, March 10, 2014 5:08:32 AM UTC+1, Chin wrote:

 hi,
 I am a newbie in using *git*. So any help in the right direction would 
 help a lot.

 I am working on an issue, on my local repository, and I found that this 
 bug was fixed in the kernel.org repository.
 So now i am trying to pull in (cherry-pick) this fix (commit-id) from the 
 kernel.org branch and submit it to my local gerrit. And I am trying to 
 maintain the commit message of the commit from kernel.org branch.
 When i try to push this fix on my local gerrit, i face the following 
 error:
 Error:
 To ssh://username@123.321.12.1:1234/mirror-sec/asdfgt/hjks
  ! [remote rejected] *branch* - refs/for/*branch* (not 
 Signed-off-by author/committer/uploader in commit message footer)
 error: failed to push some refs to 
 'ssh://username@123.321.12.1:1234/mirror-sec/asdfgt/hjks'


 I reckon Gerrit is configured to reject commits that are not properly 
 signed off: 
 https://gerrit-documentation.storage.googleapis.com/Documentation/2.8.1/error-not-signed-off-by.html

 I think any cherry-pick commit you make is essentially a new commit which 
 just happens to have similar contents to the commit you are cherry-picking. 
 Hence, the sign-off is invalid, and the commit will have to be re-signed in 
 order for it to be accepted.

 So, you either have to sign it off yourself, or remove the Signed-off-by 
 line from the commit message. OR you just force your way past Gerrit's 
 policy here according to said documentation.


-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.