From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id QEYkLXXPh2T+0QAASxT56A (envelope-from ) for ; Tue, 13 Jun 2023 04:07:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iG8wLXXPh2T48QAA9RJhRA (envelope-from ) for ; Tue, 13 Jun 2023 04:07:49 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 627032D11D for ; Tue, 13 Jun 2023 04:07:49 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8tRH-0008Dn-Qp; Mon, 12 Jun 2023 22:07:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8tRG-0008DZ-AZ for guix-devel@gnu.org; Mon, 12 Jun 2023 22:07:18 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8tRE-0002yN-DN for guix-devel@gnu.org; Mon, 12 Jun 2023 22:07:18 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id BCECC32002D8; Mon, 12 Jun 2023 22:07:11 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 12 Jun 2023 22:07:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=mesmtp; t=1686622031; x=1686708431; bh=VXP63iKPtbFtV499hu7pUT/OTktrQTBCYwvdWR9c030=; b= HwZeyLI+TWlwzIccjqItzG3m4qDipB+mP0UYlyAtT4ufgDDYrpegbBLAVNw3dBij go0Alc/e3Kql10QdSHrTSX/FYJ6Y9+1TL3ais32DD61O86d0fqRzsByDaxbMantZ jA0THXEg6y2eeRvtdO+BPzRt0pxKN2EFvLKNskIEteg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1686622031; x=1686708431; bh=VXP63iKPtbFtV 499hu7pUT/OTktrQTBCYwvdWR9c030=; b=OmrJLa5TdYI77PC/9kwsS3She2/h2 aQXvHGohSzr99UWdmNKOblms0Or6g5Stdpq+0Ps4sbqR8cZhq/xwpun4WEePoj1h KV9yyrBcAOrm/V9uKqVehMclkTqFEkaRg/f5le8Ui3KNRpLnHcU8NH9khGnO3Y76 my/PEpFGn8dUD/aZbabryoNbix+Zejq1PYz3UvppWuifaIAMtunOr2u9OrWxHTNU JhSZqEBYM3p6tEHV6/KHbVtU0+cjS10MWLXlziFTOIifFSKjMY9pYWatwTQkc2/O Ab1bwGukpw5EmINIbwQxM2oZDYVNuVWQAg+QPUIe6idpm7H/XNA5Cxqdg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgeduiedgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepieetudehfeekueefleegudfhjefgleehfeeluefhfeffgfeuudelhedvjeel ieetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 12 Jun 2023 22:07:10 -0400 (EDT) Date: Mon, 12 Jun 2023 22:07:08 -0400 From: Leo Famulari To: Maxim Cournoyer Cc: Felix Lechner , Andreas Enge , Christopher Baines , guix-devel@gnu.org Subject: Re: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] Message-ID: References: <168610879676.2825.9044237296073582277@vcs2.savannah.gnu.org> <20230607033317.826FCC23EDC@vcs2.savannah.gnu.org> <87sfb31qqp.fsf@cbaines.net> <87wn0aadrb.fsf@gmail.com> <87352xady4.fsf@gmail.com> <87y1kp8q11.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87y1kp8q11.fsf@gmail.com> Received-SPF: pass client-ip=64.147.123.20; envelope-from=leo@famulari.name; helo=wout4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list 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+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686622069; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=VXP63iKPtbFtV499hu7pUT/OTktrQTBCYwvdWR9c030=; b=KCim8qAgtUvXJap9D9SmuMptcr7k5ADXqWNpUnnAwFF+A5z3hfSbchmXl/9dZa5ABYS+xq lpbX7uV6tntzPbnoieO7dzX2yXXHcuNExSW9Fgc66dl81srU+Z1Urd7PyDCJSQbiaOl5XY FCLvLSsAPZth3s6iopGGRXmCKxP6UL/lm9Ms9lGQYnfJ0ad536O2/wYpgpvDdQzs0wA6sZ KDPdHLdI+J9r/WI6cmPBGPtvTZ5HpZau2RVNqSAV8Mf3f7jCHHjEwIrhJA3eilZaJHXnEL AzwBWNNCo8AjJ51xeYNU/I9nyrFhO9zti4FbfopBT5V0yNGQqadk+4QZeufSeQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=HwZeyLI+; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=OmrJLa5T; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686622069; a=rsa-sha256; cv=none; b=dwbickOBkCk1Fn7veTOvVpCb4TiCzaoIp6rIOX+n39W56T4Sq2fFVVpa5JiJzyiYt/FVa7 kdpuBQsqwGZW605JpOfLkaW3UGXht+ElIq0gGm81lccnKJPN5bJIHHvoMq0Z7rlHhtnw9a CCuznGyIzMwb3bdyAi/3B37jPzKK4cueG2FkYbBGjbAAKjIgk/N+2bQjfTwJT5seWTFmlA t7epamnIpr0ENDPDO4O2/NS1tu7DG2zygpM6Q0U3EkgG33IE69zemnuI1cy3rHV5xNPGIh VX6E0MJIDq1kyYwtxnPqSadaAvzyYaNn3lr8SBvZvAN+FlatVzjSVgI7zym/0w== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 0.88 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=HwZeyLI+; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=OmrJLa5T; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 627032D11D X-Spam-Score: 0.88 X-TUID: zd0DsP8AQoD1 On Sun, Jun 11, 2023 at 08:47:54PM -0400, Maxim Cournoyer wrote: > I'm not sure how that'd work, since Git only allows a single PGP > signature per commit, as far as I can tell. When you rewrite the > history (by using rebase, say), the existing signatures of the rewritten > (rebased) commits are replaced with new ones generated from your key. Is it so bad to re-sign commits on feature branches that we should lose the easy-to-read history of rebased branches? To me, it's much easier to understand and review a branch that has been updated by rebasing rather than merging. I think that counts for a lot. Do many people feel the same way? Re-signing the commits is messy but I don't think there's even been a consensus that it's very bad. I think that re-signing commits while rebasing is consistent with our security model which (as I understand it) considers committers' and their machines to be trusted. And that the meaning of the signature is merely that the committed changeset was definitively made by someone with the key.