-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[backport] Gpio Interrupt fix for the CC2538 #7314
Conversation
Is it the backport from #7303 ? Then I think there's something wrong: the commit is not the same (correct me if I'm wrong). Second problem: prefix the PR title with [backport] and give the same title. Please re-open another one. |
Sorry, looking at #7283, the commit were different there as well. So I'm wondering what is the correct procedure here. Cherry-pick ? Direct PR of initial branch ? |
@aabadie I think this backport is fine, it matches #7303 though the commit hash is different. Me personally made that mistake when backporting in the past, too. @AnonMall: either create a new branch based on release-branch and cherry-pick your fix-commit or rebase the original fix-branch onto the release-branch, would do I guess. Anyhow, I ACK this! |
Ok, thanks @smlng, then we can merge after Murdock is green. |
Just to shed some git knowledge: that's impossible. 2017.07-branch and master have now diverged, so rebaseing the commit in #7303 will always result in a different commit hash, since it will have a different parent. Remember: the hash is generated from an objects content, and a commit object consists of the tree's hash it s pointing to, the hash of the parent(s) and commit and author date.
The way it is done here. If you don't trust your eyes make a diff to the respective merge base and get a hash of that ( |
@miri64 thanks for clearing things up - it was my (intuitive) understanding (but wasn't 100% sure) as well that is impossible to have the same commit hash with two different parent-branches. |
(cherry-picking internally is the same as rebasing btw, just done manually) |
That was my intuition as well, but I was unsure if I missed something in the RIOT procedure. |
CC2538 gpio interrupt fix, where the interrupt has not been properly acknowledged