From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: Re: =?utf-8?Q?=E2=80=98core-updates=E2=80=99?= merge is a squashed commit Date: Thu, 04 Aug 2016 16:45:56 +0200 Message-ID: <87vazgegnv.fsf@gnu.org> References: <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> <87vazgy8ex.fsf@netris.org> <20160804141016.GA6889@solar> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVJuU-0007K4-6J for guix-devel@gnu.org; Thu, 04 Aug 2016 10:46:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVJuP-0000PV-Uv for guix-devel@gnu.org; Thu, 04 Aug 2016 10:46:09 -0400 In-Reply-To: <20160804141016.GA6889@solar> (Andreas Enge's message of "Thu, 4 Aug 2016 16:10:16 +0200") 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: Andreas Enge Cc: guix-devel@gnu.org Hi, Andreas Enge writes: > On Thu, Aug 04, 2016 at 09:23:50AM -0400, Mark H Weaver wrote: >> I just did this. Huge thanks to Lisa Marie Maginnis, GNU sysadmin >> extraordinaire, for promptly responding to my plea for help :) > > Thanks to both of you! > >> 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'. > > Sorry for that! I did not think it would be possible, and working locally > without signing every private commit is much more convenient. With gpg-agent and git properly setup, signing every local commit is not that inconvenient IME. I recommend you to give a try. ;) -- Mathieu Lirzin