From nobody Thu Jun 09 19:36:05 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 9E64E83AAFD for ; Thu, 9 Jun 2022 19:36:11 +0000 (UTC) (envelope-from grembo@freebsd.org) Received: from mail.evolve.de (mail.evolve.de [213.239.217.29]) (using TLSv1.3 with cipher TLS_CHACHA20_POLY1305_SHA256 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.evolve.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LJvTk1dDMz3HKd; Thu, 9 Jun 2022 19:36:10 +0000 (UTC) (envelope-from grembo@freebsd.org) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id 756603e0; Thu, 9 Jun 2022 19:36:08 +0000 (UTC) Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id fc4647c4 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 9 Jun 2022 19:36:07 +0000 (UTC) Content-Type: text/plain; charset=utf-8 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 (1.0) Subject: Re: git question: How do I push a cherry-pick of someone else's commit? From: Michael Gmelin In-Reply-To: Date: Thu, 9 Jun 2022 21:36:05 +0200 Cc: freebsd-current , imp@freebsd.org Message-Id: <1EB3B7BB-4249-4ADE-A643-E5DC2B197D82@freebsd.org> References: To: Rick Macklem X-Mailer: iPhone Mail (19E258) X-Rspamd-Queue-Id: 4LJvTk1dDMz3HKd X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 213.239.217.29 is neither permitted nor denied by domain of grembo@freebsd.org) smtp.mailfrom=grembo@freebsd.org X-Spamd-Result: default: False [-1.41 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[grembo]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; MV_CASE(0.50)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_SOME(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.84)[-0.836]; NEURAL_HAM_MEDIUM(-0.97)[-0.972]; MLMMJ_DEST(0.00)[freebsd-current]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:213.239.192.0/18, country:DE]; SUBJECT_ENDS_QUESTION(1.00)[]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N What is the error message? Did you try =E2=80=9Cgit push -f=E2=80=9D > On 9. Jun 2022, at 21:33, Rick Macklem wrote: >=20 > =EF=BB=BFI just tried to MFC a commit done to fix my commit by imp@ > and it won't let be push the cherry-pick. >=20 > What's the trick to doing this? > Or do I need to get Warner to do it? > If so, it's 393b7606f9c1 in main, that needs to go into stable/13. >=20 > rick > ps: The stable/13 build will be broken until this gets resolved. > I'll revert the MFC if it isn't fixed soon. >=20