From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: core-updates merged! Date: Wed, 3 Aug 2016 13:24:17 -0400 Message-ID: <20160803172417.GA10236@jasmine> References: <20160801081958.GA2211@solar> <87lh0ggnyt.fsf@gnu.org> <87invje1yx.fsf@we.make.ritual.n0.is> <87invj84bc.fsf@gnu.org> <20160802174821.GA29590@jasmine> <874m7297xg.fsf@gnu.org> <20160803040446.GA23535@jasmine> <871t253ith.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUzuE-0007OH-8b for guix-devel@gnu.org; Wed, 03 Aug 2016 13:24:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUzuA-0006T4-UX for guix-devel@gnu.org; Wed, 03 Aug 2016 13:24:34 -0400 Content-Disposition: inline In-Reply-To: <871t253ith.fsf@gnu.org> 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: Ludovic =?iso-8859-1?Q?Court=E8s?= Cc: guix-devel@gnu.org On Wed, Aug 03, 2016 at 06:42:34PM +0200, Ludovic Courtès wrote: > I think you should start from the pre-merge ‘core-updates-next’, sign > commits that are unsigned (I thought Manolis signed them all on the last > rebase?), then merge, and finally push. Unfortunately, signing old commits causes subsequent history to be rewritten, and the subsequent signatures are lost. I would have to re-sign commits all the way back to June (for aebd383). And Git users' local history would become invalid. By the way, all the commits that are rejected by the hook are from the master branch. > Not ideal, but hey! Very! I'll wait for replies before taking this drastic action. I think we are hitting something like the problem I warned about here: http://lists.gnu.org/archive/html/guix-devel/2016-07/msg01220.html