From nobody Thu Jun 09 20:16:33 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 7EF0C84239E for ; Thu, 9 Jun 2022 20:16:42 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-YT3-obe.outbound.protection.outlook.com (mail-yt3can01on2070.outbound.protection.outlook.com [40.107.115.70]) (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 4LJwNT4TFXz3QxR; Thu, 9 Jun 2022 20:16:41 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iVyYByXH5NGCUnE2DotGl9t7gsOmy2pkg73kXoTTcb0xr7w4d2XLrW4+t1puk3fTnlSszlTzb+08D8h6G4s1cuHdqiaYAgI5vfN+oArZjEwn79370To2Q4BbGrrgv+TrLbjOfXCrGsh3LhDXPGTDWAqlsM0613Ygx2JVnibQECT5J2klA8E1ERwMwreZmfxPvJHtVvMEMipCLDidOdEIDVHWltWf5gubsGigLwrdeKNytFOY3YFxqLqHTFEpxnrsqqIS0OEFugRVzu5fIsh78Q5omYqqUNNoNO3xR9GF6TV5ojvkZh61yJZ5HTp9TTlu9w3zt/TnR1y253lwNAO+RA== 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=xPu756on9by4B1U/F18+VOEYHhHpmE46+qO22TxzEa4=; b=Rwzs67gXpHm3r0/WT1xmvhLTPXrsQ2jdhz6B10jeqmHCZILJeQi8UzfTuL8oRGykopnZVww2SaCQZxxhcpjDlQyTo71hE3PLUlLyj5SuU+lZnYJaJbr/9qK0NOPIOpzkNU6TPVAuum22/B+TOS53P5KjK+3x+sbUb5sOlZBuyXiKkR/Mpav99vDCGjY69kfKMl8NcGCldunNSUsP1vWbcZuFVHJWfWKAGb93EgK43ENbanqo+cCuJVSGvETB0OblW27QZJuCRUFuIDKhc5YLm+7wJfb33X+KH0jGKRVZU9ucqw5UN4Rf8+ZgObx4yrE5fEQi52Upc5z81/eLcNQyMg== 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=xPu756on9by4B1U/F18+VOEYHhHpmE46+qO22TxzEa4=; b=d3I9LRjb1GhXdEJqcHbcSk+qcPxuYPbTrFyPUEWr7D+etRttDoBb8JmvIg0jG9ToGH3QbqBgYWXxKfSRX6nlB8MoT0JkYx8+HsgSc2jKaWIut3AjuI8Emr3EHFdAe6HPkQBsHjHeyBp6qxF9BgleFI5rTy+vgjDq2UwMvHRZ82aJgOShi7saBKnVPKpvJw37Dw07K68O7B/qBTxqKqKuxTYeKx75FYjdWshamNj8tVSYOFnLKDiGvsyX92sQ2wnWG980JHqv8ZgW77rOwxDLnNiEEiy3mQdxstmDw3Yo0HNar2ds43M6bWGuQH4MviQuh4j+xw2MN4jHqpSs59sGzA== Received: from YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:81::14) by YT2PR01MB5917.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:4f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Thu, 9 Jun 2022 20:16:34 +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 20:16:33 +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+3VvmpnWyNK1Hel4AgAAAauqAAAWBgIAAAf1q Date: Thu, 9 Jun 2022 20:16:33 +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: 5f43e108-6512-40e9-31b0-1f645d7dd263 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7765d5b5-f192-4593-7d3a-08da4a54f2e0 x-ms-traffictypediagnostic: YT2PR01MB5917: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: ZosxI7uG6miAzPdfkiDPHNw9h+y8BmFqsIH7dxmCVV1sU5SGQGPfExYrDNGFnvTMxL9B02ubMYIUMOctynt9dsFxPDdzjLAjwcIT1ML3ac8bM6v/47SxS/lsK9qUXEG+Rv8LAHcQDJqvP7vQVTI5ZhE+9BrIMMfMb/JoRdJOaSGO6WdsHy4kxyNXBuBqnTFjQp0XeZYZ+kTOGgx3YLp9NFQx1u80qnCTv1UEyvU++gG45lztX+04p4yg+cXhdltcPrUqiKMoITKv+iJ/NbITNkTRZrPLF62GWj2FlEoL3sET6mbRpmyTmt1zS/MQTTfvyQZyHyv2SN/+ubJiMyv9zTrLKoV3MrqTcmDbJNL62iB7fAOMp9LZWCxOqbzbkm7ot0knO9yRBte25AjNCIuRd9gIC4VSLDh1YxAOdL9o9sA6/65MWyX/Hf20KCn8RZ3K6nz3F9bxPWCE3a9HR7ac7ZrqdLPZYgfuzmfrM/HLbWihS7zgdv/kz4Dxw98dObfDT0f570m3xxLQVqAxHdKlRUJmemQkcIDfjBDuI7VDzKG2MwsHEEjvxjVPO7GIXx5EDaLhUchE0b2ukLQD3J5RyAoAXN2pUPsmYSQuh8xA1rwodudgX33//dCuKG8U1oC3ZYHm1pU0X3eogRisHOie43Kdlow63m8RWGJzKgEi2RQLBrcMhVFr02S73NM/ysflcV1E0O7fk4ndJyvmNzoU5A== 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)(186003)(83380400001)(38100700002)(8676002)(71200400001)(8936002)(76116006)(55016003)(6916009)(86362001)(4326008)(316002)(54906003)(508600001)(122000001)(786003)(5660300002)(33656002)(52536014)(38070700005)(7696005)(91956017)(2906002)(450100002)(66946007)(64756008)(66446008)(66556008)(66476007)(9686003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 2 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?HSf7XLM698xzbo1m0VqhGfdHot0ESrV57Z/ZtotWaiQJ7BI5VVbWR6Ld0R?= =?iso-8859-1?Q?Iwbd9Yxwnzh3fAJydpo1UtSOXgRDhkE9xHFcKeKNthLi+lXcHjA569Ztsv?= =?iso-8859-1?Q?EzmElsNfHYSaC9aOzV6JFKc5Zl8YzAErQou3ArmWjUUzlXduRO1Ok56oD8?= =?iso-8859-1?Q?F8x3TkOPnx77uUrKBKRrA6YFUsBgUI+E4oJYExVY/GAunvtkWPe1SKan3N?= =?iso-8859-1?Q?1BhWuZlw3+Ycdwt5lxDHh9/7nz9lt1TxLLa19UO5FTCbhy+IZK850qIeOu?= =?iso-8859-1?Q?Q22YzNWoLXKoGGH0DjvxZtNI8onqJzlFUthpxNg3TcLAL6+uDU8ubAqHWW?= =?iso-8859-1?Q?DokSfSCkIFJbx+szqOsAxNWssdqn2doNnIgxM0z+XRtf9Nx5C6nRmyeJnP?= =?iso-8859-1?Q?3OGW9izENjz7NMqBBqPXEl1a+XVGL5oPGNMtVJdH6lacXNo8OItt+vRicd?= =?iso-8859-1?Q?fKObNlZUNfZvYZ2Am08JMChV8t/O0UKrwJ1+FTKL0zUp29dFJcUZF+hc9A?= =?iso-8859-1?Q?xRh6rQrwTBASP36Htii/BKwlOT0r+cG0Uy7xVwaaF/HKnHlW429k0eaF7T?= =?iso-8859-1?Q?eTzb8dU6hxsRNAo528edHRq8COtlBYII2SrAM2QRdR+XMYVOkzLTMnfH13?= =?iso-8859-1?Q?9xfZgZY+td256uu4NVNWT/vvajIf3J4zkxPtc+amhGFExrWH+J75/yLxNZ?= =?iso-8859-1?Q?bwDUyl8CLEZiER237iuR0rqNpe3CCReG/YBN80HY74/69W1LOBJF9SC+zc?= =?iso-8859-1?Q?Mq8nUOBkTW0cwbetYVoIkPehAj3OmzjDc2CjUTfqqtV8TaKPHJZCInw4QV?= =?iso-8859-1?Q?xoKtvHuLv7lKfh7sjWZzKb6hRHKqjSRptBMfc954UuxTh2Lz1SdTdnKBIg?= =?iso-8859-1?Q?51bo5rhHvvDCeUdfv9MttYeK6zkrG8+dmn7CNmc4EioqrvcgNwInFOWCh/?= =?iso-8859-1?Q?2vg7CsJdKyMEnQe12Rb6v3JNrosH0uXOltffKqtHmQgbGbDO6i5A5aS2ay?= =?iso-8859-1?Q?+RvEfbF4BAK9C9dfJHJt1+n3NKeZmuZPxCXY4SjR0AtVMqDnnmPACCRIsi?= =?iso-8859-1?Q?NnQBmPKDiL5c9SR7XVQOShi1RFts+F/mwOdgOZCadPIfI1QuFzKG0g0mXA?= =?iso-8859-1?Q?8LZruy8fMrNvIUJ2RFa+lDh4bkYciXkfSFYCX7gDIp8kxNlr7ltiBV3g96?= =?iso-8859-1?Q?0DmBA9dtl4+2os4xp0US78eQ33wopvL41ibKz/Rn1BX5p67Ae9d8Ao2nJf?= =?iso-8859-1?Q?mie1XKPqlGL+FD+VXY1gpfR3coPlk6HyVuU4PKAU7YLJY9XRpgwSIzzrw6?= =?iso-8859-1?Q?emnG2yVZjx4NK9hGnn7Ow0s5ioOyne9x/yGsqKBXZRhwANm0WfgE6sgDMI?= =?iso-8859-1?Q?cJBVm014UKRkHRlKdtSSSp6+1I9UhaQ9Ht4FhUIDKiIsU/fwB3/ef1llCR?= =?iso-8859-1?Q?+xCMpfr26k9dfB3mALsrlXBk9pLmzqKte16G85jh5tJ/9wNvZINRlSVQwa?= =?iso-8859-1?Q?hwhC34DHLIo4zUZW9fIhBcw6Dx6XusLK2oQ9BoOkoHV1taSIx53BaPgqZw?= =?iso-8859-1?Q?kNGgDrAGzlkVHPf9EEkKW57lsvdakZedF5ak7bfL7/UwKioeT0jnOfPYCJ?= =?iso-8859-1?Q?tO6G5eaex32BkWM7mvrLwmqJoFPaYpflRir+7q17f//VhM+N0RSGajy/ES?= =?iso-8859-1?Q?u7dSsivNfaBUNK3lV2/up5CjVmPs4I9v+d3meXM39AYHe01Kd1qO/QO5bc?= =?iso-8859-1?Q?0J927LV+VAu1vtuUgnIzssA+9+48Z0kdAsbgNaZTiDrZYRLtVW0gF+ZeYT?= =?iso-8859-1?Q?aVxIIvU34mRERnsULo1OX4NjZxAgI7lYnNrCL4SuxNWEAxb5HFias6MN8R?= =?iso-8859-1?Q?P1?= x-ms-exchange-antispam-messagedata-1: JIZZP33f9WL17g== 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: 7765d5b5-f192-4593-7d3a-08da4a54f2e0 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2022 20:16:33.8228 (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: knxuizo4LT8hR+bH0mPQkP8VRpj6AiP4zTsXNbacZ78IOhIaZ8dFDhtcQEfOBxe5xoPbkWyancv9JIA8H5O3Mg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT2PR01MB5917 X-Rspamd-Queue-Id: 4LJwNT4TFXz3QxR X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=uoguelph.ca header.s=selector2 header.b=d3I9LRjb; 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.115.70 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.115.70: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.115.70:from] X-ThisMailContainsUnwantedMimeParts: N Mark Johnston wrote:=0A= > On Thu, Jun 09, 2022 at 07:49:53PM +0000, Rick Macklem wrote:=0A= > > 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 invoca= tion.=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= > I'm not sure why you'd need to specify the remote if your first attempt= =0A= > to push to gitrepo.freebsd.org failed, given that "freebsd" presumably=0A= > points to gitrepo anyway.=0A= I looked and, without "freebsd", it uses "https:..." instead of "ssh:...", = so it=0A= is pretty obvious why it failed.=0A= =0A= Thanks for the help, rick=0A= =0A= > Hopefully I haven't screwed anything on the git repo up,=0A= =0A= Looks ok to me. :)=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= =0A=