From nobody Thu Jun 09 19:44:58 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 15C9A83C96C for ; Thu, 9 Jun 2022 19:45:09 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LJvh42DKzz3Kl8; Thu, 9 Jun 2022 19:45:08 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x732.google.com with SMTP id c144so15985889qkg.11; Thu, 09 Jun 2022 12:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Q4Hi4gt+v5o/sMN9iGOUIg8i+cyw8yK3/PBXPP9d3Ec=; b=KpLXKkbcv+/NgQTnYXPib7n8gtC7jjUS+PTpOb8lOoMcV7Y4BExvshedN/BOt9RESy zM6/dmu94cPa5HmBgxMAwdmINxTUrt/EOYtcBflCCqBvoB0vRyM4iHfLWLknSM1FStyV fs5BJ+eF4Za1fFeNO5ZDa7ja70QTVHbXBR59s61HlZJe+eHqTLA/hmIP1sTcSw3pfvvF c40U2JhjzXKNa5cbnUKHFvm+RuiTzTCUYHPKaNdNLk6Cq4rfKHfL0YIyfylDyCVnYhVV khjC2kYqPrnkoTa02SKOl7gAHmMhQy1cs2x1wcCzNUJeWEqtajWvE9GBC2PMNY+jzgPL V83w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=Q4Hi4gt+v5o/sMN9iGOUIg8i+cyw8yK3/PBXPP9d3Ec=; b=f7US5WBLBLYakQvTS6v6ChxqvOAhSwsKDlSRzLALnus+JaUHUpShUbDq7qIlc1BJR8 udSEPAZj7DMdZ1wrwdVjaU9WdX46f+NoSYPnhWSECCF1JrmSuECzPic+WPdrPP86gA5P v/TcCU9Wzop8Euz1nbYcwVcYW6zwmCZDvOcEUCA2UUcyHeTKtfROKPqbw7kR7daspM18 ZzYuATcF49STFzkHbI8Yq38RE9oy+OWv7f456IzO00QngoflV0Va3Oe0IEnmq36MTToR nD3GlmKiIijhd4NdttCab61b4H1DDVLbnD2OxaQxCORFXcqNAj94INNp44MxcQ538tvv f84g== X-Gm-Message-State: AOAM5306wP1s3cgNIlvohg65tw2k8dhBXtWMA5r/2kVfQ3SvKz/yUMtP mD6T1V2SSCXCmNWQQYoPl7Y= X-Google-Smtp-Source: ABdhPJwlKpEko1QY2+itzKnNhWqgR4Hov601hSlavujp/Pufji6ShcQbCftioEpzVCt3GVti9CPhZQ== X-Received: by 2002:a05:620a:318b:b0:6a6:cb0b:bb3d with SMTP id bi11-20020a05620a318b00b006a6cb0bbb3dmr13425395qkb.480.1654803902141; Thu, 09 Jun 2022 12:45:02 -0700 (PDT) Received: from nuc (198-84-189-58.cpe.teksavvy.com. [198.84.189.58]) by smtp.gmail.com with ESMTPSA id l2-20020a37bb02000000b006a2e2dde144sm19033167qkf.88.2022.06.09.12.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 12:45:01 -0700 (PDT) Date: Thu, 9 Jun 2022 15:44:58 -0400 From: Mark Johnston To: Rick Macklem Cc: freebsd-current , "imp@FreeBSD.org" Subject: Re: git question: How do I push a cherry-pick of someone else's commit? Message-ID: References: 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4LJvh42DKzz3Kl8 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=KpLXKkbc; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::732 as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-1.70 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; SUBJECT_ENDS_QUESTION(1.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::732:from]; MLMMJ_DEST(0.00)[freebsd-current]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On Thu, Jun 09, 2022 at 07:30:47PM +0000, Rick Macklem wrote: > I just tried to MFC a commit done to fix my commit by imp@ > and it won't let be push the cherry-pick. > > What's the trick to doing this? You need to add --push-option=confirm-author to the git push invocation. > Or do I need to get Warner to do it? > If so, it's 393b7606f9c1 in main, that needs to go into stable/13. > > rick > ps: The stable/13 build will be broken until this gets resolved. > I'll revert the MFC if it isn't fixed soon. >