From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: =?utf-8?Q?=E2=80=98core-updates=E2=80=99?= merge is a squashed commit Date: Thu, 04 Aug 2016 09:23:50 -0400 Message-ID: <87vazgy8ex.fsf@netris.org> References: <871t253ith.fsf@gnu.org> <20160803172417.GA10236@jasmine> <878twd20ui.fsf@gnu.org> <20160803183911.GC11621@jasmine> <87wpjxy4ta.fsf_-_@gnu.org> <20160803211032.GA6034@jasmine> <87a8gtyntw.fsf@netris.org> <20160804082400.GA1638@solar> <87ziosyalv.fsf@netris.org> <20160804124032.GA5789@solar> <20160804130409.GB6326@jasmine> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVId7-0005RR-8n for guix-devel@gnu.org; Thu, 04 Aug 2016 09:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVId1-0003iF-9V for guix-devel@gnu.org; Thu, 04 Aug 2016 09:24:08 -0400 Received: from world.peace.net ([50.252.239.5]:39310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVId1-0003iA-5T for guix-devel@gnu.org; Thu, 04 Aug 2016 09:24:03 -0400 In-Reply-To: <20160804130409.GB6326@jasmine> (Leo Famulari's message of "Thu, 4 Aug 2016 09:04:09 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari writes: > 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. I just did this. Huge thanks to Lisa Marie Maginnis, GNU sysadmin extraordinaire, for promptly responding to my plea for help :) However, we should take steps to avoid this problem in the future. The most recent unsigned commit on 'core-updates' was from only 3 days ago, by Andreas. "gnu: unison: Add input ghostscript". I'm fairly sure this was after we added the commit hook, so I guess the hook only applies to 'master'. So, if I understand correctly, we're currently in a state where unsigned commits can accidentally get pushed to other branches, making those branches unmergeable into 'master'. Mark