From nobody Thu Jun 09 20:06:09 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 C3C72840820 for ; Thu, 9 Jun 2022 20:06:14 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 4LJw8P4rRrz3PQ0; Thu, 9 Jun 2022 20:06:13 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qv1-xf29.google.com with SMTP id a9so17295249qvt.6; Thu, 09 Jun 2022 13:06:13 -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=H2Us7ePCtT/lcR3VApmu2b8i1DjRX1honvZSIlafIoA=; b=UPe1t7y3ByRlQqLz4zohT/upvFqF8PJuNkZGgVtDyC/uZEOALiRLbc7Ud7QYt5YwlM HqLAAaaaXURf9I60Fe4+riCT9DSFNGFj5IICsupu4jBKNi6eKenR7xBCqkTQSjKcFM50 UbBoF8iI1PS19yMVAKG5wThSLBILGqZVkV0nem317d6ULGAqVX6xlhGM42mqjriu1eFD UEeK/WXkUJTvxmpzEpKDdYNLOsMMJEfCuYkxKIFaTvHKtM607k85omM6xoDyGkLntwvj xzd2H9MFlL29d7jU+vjEa/vyH/nH6zuhTq/yxEBka+S3nyh4uioR5mZ5QsDeDGqKW60V vABQ== 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=H2Us7ePCtT/lcR3VApmu2b8i1DjRX1honvZSIlafIoA=; b=LKoJc0888rmnJj1UCAyf3C6PVtzm55JtFf5U575Ejb5mX2essvUCOzMp645MvtJaCs oalDRcgsxcUxQz0yvkwUbTyBbJnibp0nkG+HV9tCos0u9KHHsCYkivtvn2Ixp6TtAgj8 Gr8+yTFfOX0uJp6LIr3nf3bzWr/4hmqD5UWJSomEY9kFQxenYFgRMSD2BjU5ox19A5lb cKoYZ9O/fG01FMaZkz0KtprUw5HMEW8BIgQyExwp0rqvoi6LEDR0bPcVXNySe7OB8Ff2 Q7UpRhn6S6PAg15z7r5siSNDoRxORVNx2I0nVro2JB3ninu3A5rVUcFpmmdius2osnsb c+Cw== X-Gm-Message-State: AOAM532VangLjUgovjBmw+X2ZNHwXqywoPGjeXA4WGYt0ylUk0gOsTPC IWps8mbUzLI8aqE2r8r9Gds= X-Google-Smtp-Source: ABdhPJyuJLaQ1sIcZi5HJeIkwYdUYHP73wzoknZYK6cTF8xcLNjsUOtBK4h00VW/mSIpgq9eP7ZAAQ== X-Received: by 2002:ad4:584c:0:b0:464:5904:998d with SMTP id de12-20020ad4584c000000b004645904998dmr41869653qvb.33.1654805173031; Thu, 09 Jun 2022 13:06:13 -0700 (PDT) Received: from nuc (198-84-189-58.cpe.teksavvy.com. [198.84.189.58]) by smtp.gmail.com with ESMTPSA id s3-20020a05620a0bc300b006a66f3d3708sm21829636qki.129.2022.06.09.13.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 13:06:12 -0700 (PDT) Date: Thu, 9 Jun 2022 16:06:09 -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: 4LJw8P4rRrz3PQ0 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=UPe1t7y3; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::f29 as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-1.69 / 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]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.996]; 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)[-0.999]; 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::f29: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:49:53PM +0000, Rick Macklem wrote: > Mark Johnston wrote: > > > > 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. > Ok, thanks. > > It did try it as the message suggested: > git push --push-option=confirm-author > and it failed because it couldn't push refs to gitrepo. > > However, since you suggested it, I did: > git push freebsd --push-option=confirm-author > and that seemed to work. I'm not sure why you'd need to specify the remote if your first attempt to push to gitrepo.freebsd.org failed, given that "freebsd" presumably points to gitrepo anyway. > Hopefully I haven't screwed anything on the git repo up, Looks ok to me. :) > Thanks, rick > > > 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. > > >