[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ‘core-updates’ merge is a squashed commit
From: |
Leo Famulari |
Subject: |
Re: ‘core-updates’ merge is a squashed commit |
Date: |
Thu, 4 Aug 2016 09:04:09 -0400 |
User-agent: |
Mutt/1.6.0 (2016-04-01) |
On Thu, Aug 04, 2016 at 02:40:32PM +0200, Andreas Enge wrote:
> On Thu, Aug 04, 2016 at 08:36:28AM -0400, Mark H Weaver wrote:
> Good news, thanks for all this work!
Indeed!
> > 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.
Yes, I had this problem yesterday.
> 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.
I think we have to do this, unfortunately.
- Re: core-updates merged!, (continued)
- ‘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, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit,
Leo Famulari <=
- 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
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04