[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ‘core-updates’ merge is a squashed commit
From: |
Andreas Enge |
Subject: |
Re: ‘core-updates’ merge is a squashed commit |
Date: |
Thu, 4 Aug 2016 14:40:32 +0200 |
User-agent: |
Mutt/1.6.1 (2016-04-27) |
On Thu, Aug 04, 2016 at 08:36:28AM -0400, Mark H Weaver wrote:
> On my local machine, I did this successfully by first reverting a couple
> of later commits, then reverting the squashed merge, then doing a proper
> merge, and finally cherry-picking the later commits. I verified that
> this sequence of operations made no changes to the tree.
Good news, thanks for all this work!
> Unfortunately, when I tried to push it to 'master', it was rejected
> because of 56 unsigned commits on the 'core-updates' branch. Note that
> all of the new commits I made (the reverts, the merge, and the
> cherry-picks) were all signed by me. The unsigned commits that are
> blocking this have been on the 'core-updates' branch for quite some
> time.
>
> If there are unsigned commits on 'core-updates-next', I guess we'll run
> into the same problem trying to merge that branch later.
A possible solution would be to disable the commit hook that forces
signatures, make these commits, and reenable the hook; hoping that noone
adds an unsigned commit in the meantime... It would require to coordinate
with a savannah administrator.
Andreas
- Re: core-updates merged!, (continued)
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Ludovic Courtès, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Andreas Enge, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- ‘core-updates’ merge is a squashed commit, Ludovic Courtès, 2016/08/03
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/03
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit,
Andreas Enge <=
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Ludovic Courtès, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Mathieu Lirzin, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andy Wingo, 2016/08/04