Migration to Github - Status update
We are in the process of enabling services on github and configuring the various projects. To allow a smooth transition and to have Github ready for development on May 1st globally, Gerrit was put in read-only mode, meaning that no further changes will be accepted on Gerrit, starting Friday evening.
If you are planning to submit anything before May, this will need to happen in github. The following initial how-to has been drafted which will help you with creating pull requests:
As with gerrit, please submit to the correct branch, for example net, Bluetooth or arm branches available on github while you create a pull request.
On Sat, 29 Apr 2017 03:20:58 +0000
"Nashif, Anas" <anas.nashif@...> wrote:
Hi,I hope you guys are aware of CONTRIBUTING.md:
https://github.com/blog/1184-contributing-guidelines , so hope the
content will be moved there to give people a chance to ignore^W read
it during the submission process ;-).
Btw, I remembered about some unpleasant issue with Github pull
requests: it seems that merging via Github UI may overwrite the
original author email with whatever is set to Github's primary user
email. More specifically, I noticed that my JerryScript patches, which
were submitted from @linaro.org email, appear in the repository as
authored from my personal email.
I have suspicion that the issue either applies to "squash" submit mode,
or appeared after it it was introduced (which was relatively recently).
Well, it seems that I didn't actually proceed to investigate it
further :-(. But I definitely would like to have the right email with
Zephyr. And Github only offers 2 merge modes: 1) squash all PullReq
commits to one, perform fast-forward merge; 2) merge with explicit
non-fast-forward merge (git --no-ff), i.e. even if a patch could be
merged as fast-forward, create a merge commit.
I hope we are going to enjoy one of the benefits of Github - ability to
submit PullReq with multiple commits (and merge it like that). Then, as
can be seen, Github doesn't offer a way to merge this cleanly at all.
So, how everyone works that around is by having a special helper
script, which fetches PullReq, rebases it, and --ff-only merges it.
Hope you guys are ready to use such script.
Linaro.org | Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro
http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog