From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: =?utf-8?Q?=E2=80=98core-updates=E2=80=99?= merge is a squashed commit Date: Wed, 03 Aug 2016 22:29:21 +0200 Message-ID: <87wpjxy4ta.fsf_-_@gnu.org> 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> <20160803172417.GA10236@jasmine> <878twd20ui.fsf@gnu.org> <20160803183911.GC11621@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bV2nQ-0007ZU-KD for guix-devel@gnu.org; Wed, 03 Aug 2016 16:29:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bV2nL-00061D-L6 for guix-devel@gnu.org; Wed, 03 Aug 2016 16:29:43 -0400 In-Reply-To: <20160803183911.GC11621@jasmine> (Leo Famulari's message of "Wed, 3 Aug 2016 14:39:11 -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: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello! Someone reported that the commit stats for the new release were suspicious and found that the recent core-updates merge was fishy. In fact, commit 455859a50f88f625d13fc2f304111f02369b366b, which is the core-updates merge, is *not* a merge commit. Instead it seems to be a squashed commit of all of core-updates. Consequently, part of the history of the files touched by this merge is squashed into this single pseudo-merge commit. :-/ Apologies for this mess. I don=E2=80=99t know how this happened. I suspec= t a mixture of me not paying enough attention, and Magit + Git + gpg somehow leading me in the wrong direction. This can be fixed locally with a graft to give the merge commit the two parents it is supposed to have: git replace --graft 455859a50f88f625d13fc2f304111f02369b366b \ 742effef5629667b274087adc70b06abab86b252 a8cb87abe98d57fb763d5b14524dc= 32c96bd31b5=20 Unfortunately, grafts are local, so anyone cloning the repo will see the squashed merge commit. Also, the replacement commit lacks a signature. I don=E2=80=99t know how this impacts the core-updates-next rebase that Leo= and I were discussing. If anyone has advice on grafts, or on how to avoid this in the future, I=E2=80=99m all ears! Ludo=E2=80=99. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXolQlAAoJEAkLEZk9muu1ZG0P/3eYeKFliORI6eEPBdtWWTV4 Se1p4iSiKL25zoAr92ZGP1XEOmdwYZlp3y3TDxIhiE0aGjvFwyfvwTATxi8JJIuo IfAW0Vh/KjDYdlV4p3jPSjiitudDfxKioeV8ITzz0RiilHuOStbCj8vdqBNRyZbJ /sa0g8sZetO+RiR4StEv0zm7mvuMf5EupfCrFNY5D7UFgDOxN1t561962dtpoNJH qVYXlsaG0t+eAgpuS84615skMh5NWeMoI7Rn3ztVS4Tb22jhLmiJsRS57YQ1crYo YAw/oJeqZGzkSDRo3cvH66oFN6g90d6iDNj57z9qenWCfJ+J/fuBoZyu3bZgrMaH bbCKjsXmyXHv2CDeqa6FsnjeZmPjk1JETlynPfOiyvFltumSYS/sjHsUxl3AfFnL o0wVQySBKHH1GYNHAxabB5U15PQlJOBX/MXxwFDMcGhuhLp8vzpsvED/eGYiVNm6 Y1DkdrfBuoQKK6ymkaZTujoIw0XS/kDSwOf1/2M9SjFWbJr6E94bEojgNhNIDnfh UGUMquU0P4nnGOuZ0Aax8owk2roAAe3bqII9FLk0Uo4SEzFsxcq7eyqVXBLC8u3c gkgT6PqqMJ0sakaPHh/wbqefgR0MsfrEKFeVd7W7zeBfnxBKDftIVVPWs8K7Wl7i jvMw2fka71ELBtSOX2fv =gFaE -----END PGP SIGNATURE----- --=-=-=--