On Wed, Aug 03, 2016 at 12:04:46AM -0400, Leo Famulari wrote: > On Tue, Aug 02, 2016 at 11:28:59PM +0200, Ludovic Courtès wrote: > > Leo Famulari <l...@famulari.name> skribis: > > Otherwise LGTM; could you push it to core-updates-next? > > I merged master into core-updates-next and made the change in a > subsequent commit. > > Unfortunately, I can't push the branch to Savannah because it contains > the following unsigned commits (one of them is mine, oops!): > > f21403e2b6f5a9491937a0cc9f31fc113998ce5e > 9bc84dfea9560c497c91863e7b5021860bd3c254 > 745ad37a780b28f72ac9dfcc8092317e577e51c9 > 2d74d94b17b23ab95072da68553d85ac0b3bfede > aebd383d04b351465cfb14e4fd0949b67d4b282e > > What should we do?
This is still preventing me from starting the new core-updates branch. I guess that we should do the same thing we did when fixing the squashed merge: disable the assert-commit-signed hook temporarily for the push. It was also suggested to cherry-pick the 11 commits from core-updates-next onto master — essentially rebasing them. I can try that if everyone is okay with me re-signing those commits. > In the meantime, you can inspect the updated branch on my personal Git > repo: > https://github.com/lfam/guix/commits/core-updates-next Mark, if you want to do method that requires disabling the hook, feel free to take my (signed) work from this link. It will save you from doing a lot of merge conflict resolution.
