From nobody Thu Jun 09 19:49:53 2022 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E231283E0A4 for ; Thu, 9 Jun 2022 19:50:02 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-QB1-obe.outbound.protection.outlook.com (mail-qb1can01on2040.outbound.protection.outlook.com [40.107.66.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LJvnj5wm0z3M3y; Thu, 9 Jun 2022 19:50:01 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P/lOxY2Tpaqvt1oRvfCQEIzEGKZ6tg8TObpdQblRX7z4Dknx4yOSV2OWX6mxuohuV1tqs8JgWCvT/yjT2BdhYn+zZzCfy1GydVuoaNK4a5upmNe22jBDk0BGgPP6+6R9thaqBAprrLMxmnstIXRJd45TILyMWjNSTltm3yxyItuqRY8oEUHT4XV6K6JRUnHYdP6G1R49YtSuTcVJwJMHa8vbND3lAyJERwEU7/Wv3aZW5J/KTXhAxoQYKUIqBw9w6OMYQonH6MlaM/MTH3LtP01bFGKNYujztrO+oS3sK8njYE8RPa7Er9jRNmcGSwrG+a9Q8fyXZ7QIkQKFVXqbQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TljoyToZmf/k31CyApRI0oSTwBe9LF+XLs7FFmcQhu8=; b=dQZ3+b/3UaU7IlXzAVShPu7Dwt6fG4kFVUYAj1H/TmtPWLnP56D9GGzIK0YyJbgYHgoM+ABTYKM0t3/wMDVjThDEkk1jk4vqQfGIgi8Mws0Y+H6t2Hu2uqN76FpvuMjGW6cgM7wwjNf4CCT7r5KV9sjtLCgFfzG66cbcco2H9CVPyBR9xKIYjejgyfsdZFiL4bBmUcqp21EBAA/67nx1gMdiGRXdyPYAW1qW6o9q2xNxraJUMTTiWIJTO7n5LT2YErxAotEta7PANZjMdcrqeMLkFYKFBoUXNxGrU9iikkTYo6D0177KDn/V0JXouPpa+zoo/ycoMfIliixW8JTV1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=uoguelph.ca; dmarc=pass action=none header.from=uoguelph.ca; dkim=pass header.d=uoguelph.ca; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uoguelph.ca; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TljoyToZmf/k31CyApRI0oSTwBe9LF+XLs7FFmcQhu8=; b=pnUVk0GUMhdY1JfYyRRN3KV7o+aUHgQJZkoSffkSpSLyXBp03xfh7NUx8EttHFVhgGBcA8mH6BIzkJVAy20k0dsS90dApyBEGBX21mSippWBLIGIWhBFKboFS+4/ZLMv8beqPnaNv5t+lfp/rvdvwFHMlJFSnMsofeJet05oP9DfmMNEtKIGNdMIWK8B9MqtZKHLsSUFYH5zV9gSqesCyH0XnqUjNLZtG7u+BWScN8soScWUpN9x3oZC6DEg7Rb679ty6e6MONkU+BmHRF9AxfbpX0Mjnfk9u+CBh1bIcswOS/afFm7/JDhZ7Ot13rN11Sr92pYv42ratFaPs/GAWg== Received: from YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:81::14) by YT3PR01MB9594.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:8a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.17; Thu, 9 Jun 2022 19:49:53 +0000 Received: from YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM ([fe80::b921:251e:4a0b:54fc]) by YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM ([fe80::b921:251e:4a0b:54fc%7]) with mapi id 15.20.5332.013; Thu, 9 Jun 2022 19:49:53 +0000 From: Rick Macklem To: Mark Johnston CC: freebsd-current , "imp@FreeBSD.org" Subject: Re: git question: How do I push a cherry-pick of someone else's commit? Thread-Topic: git question: How do I push a cherry-pick of someone else's commit? Thread-Index: AQHYfDb9qAbdi6yD7UG+3VvmpnWyNK1Hel4AgAAAauo= Date: Thu, 9 Jun 2022 19:49:53 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: ef748541-4038-4b96-381c-a73968e64730 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7934a434-1c66-485d-ebc8-08da4a51392b x-ms-traffictypediagnostic: YT3PR01MB9594:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TLlIVUzj3nUPGYipIU7rPQY6aUxvTG/rErKVN+25jm4yrGSaBNER7QNK+cRC5kARoIvuxLn3VFOQw+ctCfqBSPC+SNa2lZoBq6OXO7PupdYYRJ+Sdtd/i/FfQxVtuGul5xnE05RZDoOzr5G5mVBCdXTKIHnBQ4m6bqnybH9o+14KZlU+MIu426RxEcaGQ7rBWHtBohw4Tiz9HWVQZmHPClJBcgndBrITUPevIF24hQe34sdw5v2F2JO7OOq6ST6dwwG+GkAprd2xBrym6EEgUi4aUOjcxSAGnazfmGE7e1UkaZAKlYXDgBSb7ZANLEMoBxvgsMcwKJLTU5ZwLASX6eGm0BG8qsF5sg2+y0outd+iSZZKXPGsgrYa6dPli0J38cykn/sYXX6QWoCXBl/TaQN742UyJvkAEI3D6wX2eCIi6mF4Cz1Lpy3gaDLM6c0mUk6Tfag3Ls0K7NW9TT5NszEpIgbMMX8QZJ6gL54yZlsHyMqo2YxxoISryspq0Q5Re5fKnXWvB4sfcW8JDEF65yljo4NaZWnqhg07tqrohdwOC3BTzTG7DJzyCDcOTCTWI1mIXjbxlTvOY7yrYS8tOBVJXjM80Ig6OMRYlopsuFRdFIBAFBxsG36mBa065CcfRc7Eejmwt2WA0yQdIrU9SQSY/VBQHnDg6X95T8wi7HaYQBPIRGGJQqMdSTk0ap9Edz2WpONgDntwqLOu5QOJeA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(38100700002)(316002)(76116006)(122000001)(4326008)(66946007)(7696005)(8676002)(64756008)(450100002)(9686003)(2906002)(91956017)(66446008)(52536014)(86362001)(508600001)(38070700005)(8936002)(5660300002)(786003)(66556008)(6506007)(55016003)(33656002)(66476007)(71200400001)(4744005)(186003)(54906003)(83380400001)(6916009);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 2 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?J2pmd9xU4zHzcCuLQ5OD9zegouLBUNCqQ5gqKqS/6tjvoLMQRfmdlbF7Df?= =?iso-8859-1?Q?dAGmwAtClb6ydoXQL8dtRvjhyZeOrX+RGrBIv69MWVhRjh44dryvIKLq7c?= =?iso-8859-1?Q?M4nDXo9ueydjxAf6y565Awq0ZOljVpYiR90/g3U36bRv3YsMYi+0TgDirr?= =?iso-8859-1?Q?DRYlqE4W26NPD/w5sNIKu16YwdWjLJZ3W/htz0U9a7aYPyz7X3MdqmggCa?= =?iso-8859-1?Q?zMFsueQktsluCr3YXd+HGhnCyAneNH/Xh4SXWB4z5na39uWGEQEpCim26O?= =?iso-8859-1?Q?aYZg+fHqgmcuoBj3x940aixrYVgeOvaHJGr8CLh+6PmLgxKab6VFwfVEhK?= =?iso-8859-1?Q?yfszaxPXxOexq0Zb/t2YnjsRyKZMOUY4sx4GHGBtqeW+J2+ZURGK9sj0Nb?= =?iso-8859-1?Q?ligH58FXdhtUNIK8AG+pE+FKZGdbkoPpmKiVe1PGDb4Hmu3QDg5ubh7W4o?= =?iso-8859-1?Q?XVoHiWT1nP+zkPXmRZOiMkxvzIHjXXYx2PvzvWVyBz1MfsKyM755nRmu32?= =?iso-8859-1?Q?tQzQv6EMJ30XZbEjuJS3TIwqBw7WnJ1oGWCgwInx+V6mfn6jWheiKvkAb0?= =?iso-8859-1?Q?2sUGdnaXtdsFVu+s5oWaR68PjuP6R2pThjODAyPHEjODcBSzFbG6LC+QpV?= =?iso-8859-1?Q?ctwrKpyDz3PrDqBDseN9tTmpga/LeiBAlUXU+JJaaOZgbyKuxsJr+saeVE?= =?iso-8859-1?Q?FyWuBZfYSS5NbhO/6cMd80YG0IRJEvp3hYjb/DQ3z86dSAodsfQMO88xCv?= =?iso-8859-1?Q?k3LYCbStubAxCIeeUbagRZXAGx6Xq8I2RzNQLW+eQNyuGJQJCXEst9YMW7?= =?iso-8859-1?Q?1mrc0uXd7NlEd0++jAZ4vOcu4IrX2reVl40DVBBdunr5YOSSqZ7Sh1rO6W?= =?iso-8859-1?Q?dY7I/G0t0+MYJIcTtkiIrfcSFAzkWrhvkYdoDSwWqYMjsEzZuDP3GFbZWR?= =?iso-8859-1?Q?nBeE8a0n9WCT5gSP37as9CC0jNCOGnbre3X/bFZym1d6PW2G/jzVyPD8G1?= =?iso-8859-1?Q?6qyS9rQZyw03JdIPxQhq+ysn7bdWAVqXdodNkH14TTHtFrguyogphFtSCL?= =?iso-8859-1?Q?S/sG3c6IJWvv3wXiwV/jvLb9YQYYLwqcM6m2RoQEYrCj6HcUQNnR6MXkP5?= =?iso-8859-1?Q?GSZQPOVuEyvegr5YKKKGwVIiIHpPm/pf6nXl33XAsvda3dVm09JLkS7zn/?= =?iso-8859-1?Q?kiQd+B/L48X6I2p91/0Yd8Z3ki0CROhXI7Im/RgPl6m/VgUDcqdMhgrogz?= =?iso-8859-1?Q?nWll1PyYLenk2/akEjjiM2A6T6Nm7awe1+opRHsbX0SaCyY67U+iFcecvb?= =?iso-8859-1?Q?j0Z52f9lIYvecf0wOVQqOSyWJor65w6GPEqltvi0NCo9r14lizSYvhgOnN?= =?iso-8859-1?Q?Mw+i8phrlgQ5fxGIvRXzY3JASbqVZZ1t4I9Eh29rlCZQdaKWXpdOaEHswZ?= =?iso-8859-1?Q?oPGM2XsGBUnMWJ7i6YZXxWyYku7RQSZEBFm3Pd8Mo6TuejGM29cVyfLQ6Y?= =?iso-8859-1?Q?QfmspxidULFn0+dgcItiRB+wS4q1bSTsgfEuRJ7HaJkw0MIDqzfks5ie5d?= =?iso-8859-1?Q?GYMs/bZEBad2k70t+PNKAGPIytCsvbjCajDAu//MENCfbPpeOETUUP3agM?= =?iso-8859-1?Q?LqIZzj6uvo27Ifm0wiIPRk69H+HzLDLcByY/wXg3MyFCQsHxaeTKfc2ut6?= =?iso-8859-1?Q?ZajqGWP40Zpc/K6ysVfIcL/ICLWf0UeD+ur1sS5A+tjHLVCEEuWeRonB7M?= =?iso-8859-1?Q?3YoCJMyhS2iAh5aCrsbeFL4+j0BmyRipkPZ/mqgQ6Yvl1MeFKy9VfN9AjW?= =?iso-8859-1?Q?kmJfpGUUJcRjHJ57KsKaUyTZ5Rv4jbjYHyioJnGZF23TivKS5gq4zqq7WT?= =?iso-8859-1?Q?dP?= x-ms-exchange-antispam-messagedata-1: k9hVarLeF6L/8g== Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: uoguelph.ca X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 7934a434-1c66-485d-ebc8-08da4a51392b X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2022 19:49:53.7863 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: be62a12b-2cad-49a1-a5fa-85f4f3156a7d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: zAmhfwbFrRyGvAV+HzscHoqy5/P4B1MtJya8bN9l0iCm2rOwvq+vHMtUgjhibyDyDzS0/7uvIL846Pjui3QgbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT3PR01MB9594 X-Rspamd-Queue-Id: 4LJvnj5wm0z3M3y X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=uoguelph.ca header.s=selector2 header.b=pnUVk0GU; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=uoguelph.ca; spf=pass (mx1.freebsd.org: domain of rmacklem@uoguelph.ca designates 40.107.66.40 as permitted sender) smtp.mailfrom=rmacklem@uoguelph.ca X-Spamd-Result: default: False [-5.00 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[uoguelph.ca:s=selector2]; FREEFALL_USER(0.00)[rmacklem]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+ip4:40.107.0.0/16]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; DWL_DNSWL_LOW(-1.00)[uoguelph.ca:dkim]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[uoguelph.ca:+]; DMARC_POLICY_ALLOW(-0.50)[uoguelph.ca,none]; RCVD_IN_DNSWL_NONE(0.00)[40.107.66.40:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MLMMJ_DEST(0.00)[freebsd-current]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; RCVD_TLS_LAST(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.66.40:from] X-ThisMailContainsUnwantedMimeParts: N Mark Johnston wrote:=0A= >=0A= > On Thu, Jun 09, 2022 at 07:30:47PM +0000, Rick Macklem wrote:=0A= > > I just tried to MFC a commit done to fix my commit by imp@=0A= > > and it won't let be push the cherry-pick.=0A= > >=0A= > > What's the trick to doing this?=0A= >=0A= > You need to add --push-option=3Dconfirm-author to the git push invocation= .=0A= Ok, thanks.=0A= =0A= It did try it as the message suggested:=0A= git push --push-option=3Dconfirm-author=0A= and it failed because it couldn't push refs to gitrepo.=0A= =0A= However, since you suggested it, I did:=0A= git push freebsd --push-option=3Dconfirm-author=0A= and that seemed to work.=0A= =0A= Hopefully I haven't screwed anything on the git repo up,=0A= =0A= Thanks, rick=0A= =0A= > Or do I need to get Warner to do it?=0A= > If so, it's 393b7606f9c1 in main, that needs to go into stable/13.=0A= >=0A= > rick=0A= > ps: The stable/13 build will be broken until this gets resolved.=0A= > I'll revert the MFC if it isn't fixed soon.=0A= >=0A= =0A=