From owner-freebsd-git@freebsd.org Sat May 1 01:37:45 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AEF945F2BDD for ; Sat, 1 May 2021 01:37:45 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-55.consmr.mail.gq1.yahoo.com (sonic316-55.consmr.mail.gq1.yahoo.com [98.137.69.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXBgr3Vzcz3tZK for ; Sat, 1 May 2021 01:37:43 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1619833062; bh=dECumo0Ge9tQqgXCvPq8osEVxCOxMS2kAAfXnuwEP0I=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=QwpQg27su/H848TDft0iRWNEV6zWj7RY5Ox4Jo77mtvpeA8+oVjpSxbGpWv22g33cHMCLoZfp4ZZTBdHdohfthp3sAWFRKoSYzUTHjd40cQmqn0gljxSc3Y0nX6a4jd2PM6b6ftItvqnwTOkHSnQSbyswBNJwIIHv6Xx3TUtCJ+9/cvCjCa/Z/colTzQL9fZsqzTzR/n2hF9Jm5bKnNzdTwAddIsjDgpjAYK9/wBoXY6IiwsYDcPtbSktABu7+l2AQxLYkcCD8EB0Vi+/DQ7TFkb+qf9FWEMdkxGFPrJ4haz0pO+qu0CDvq8tRgaznpwhxSvMxA3LGwzKfbEaTp0kQ== X-YMail-OSG: Wjl_qP8VM1nuIuPot4AwHrw6bN5r.a.KO5N46wYUrj.Y7.ci7jjPaolwD.XRNYD 1Ntv61fllB1kZLZOw8JAcmZnB.hGeMR4jG3o5QBuek46XdYHxAwCu3ZZct5Z2JkV902W95KXq1Ul w2YCvSqEN6iUMPajDpIlXGREk8aomlhWE147qCtrpT.0yyjGOvMBGRP1.qCvTumH9rotpNVLa6xZ xCMqOd_ZfYfjKzU7Gl7wsFhxyp98pom2hrfkS0Emckg4sMySKa26Rpwy4nZhcuNqPReN2xihWU3h 7KjTSMR4JAOGUE2W2fJTp47OXS2SfWp0xLDRKoIBNJtGuyzl2XvyHZ3ViZkWOvATGT1FeAIVUI8e l7yqSJiLtivCQ._7EaByYfd2eKIQyKlWywP5va3jFyBbQn584cv5loDKhlq97cL5A4eJKvU8xfJ1 GTItdaDYgjiTpJSSIEc06vSvbsCbiEZQjKQUnBkmv6QCRfshvoGcoCeR57yHJMZKdhEkHs74.G8I hUCcWzt0DIoxFvsFW4fwA7nJV_NOCtsCMDZIEuDB0lhvvkGPcMM6MgyZHYT2wr8eiZxVeMJjqC3J .Wu5_VC.nuFJjEGA_TuK5oPgvL3S67s73_WwiToOXvn4IPAhOA8QB..YrQnCWirF6OVWFzG79G7r pO380aAaD1cBD1M2868IOx8oeCQ6VJQmlswBKDNkviLpbGwVltIEBiGWgjvZr8QegC1mOD5Rr959 dmIHRxWH.0YkAwdcm44jl07PIgqnvI2ml1wipinHaVxhr.t05GU_Xe1E9bVurTdGdKPHkTfOJ0f6 fUGHo5XM_nFTaRVakaoHlng3nUKXq2mrlbyizaWhT4dXZzVbcG8FXj4Wavj5O20YxjANOWp44GhD 7Ic5.mt5KsGXsZz3eYUZo82Ww90GrSR831mWHqKtjC24V60e9qw9Jd0a6Fy7NzIAfVzhXc9rlx51 AiW3GfxreID0rBmWIGLJyluw8ZBzHXepDkgG5AyOYzu55No4VbIft.4YscrVzlyRNdOJgfTrqRn4 .xilrYbnUMkkDiF8qlt6Vlr5EcbezphEajwegLIhygh.3zIx.Ik6Fs3sMDVKl5VtUajASvWwNReN pC0HqugFDoDyQrxImF8ZFHR.mAqE_VtkhfBNEd0tTDUgNT2STbTARIltj.GcmgSIYor5HaV_oAcB FTINSw7wXf1dFZGdKe4hbLbgv4L_pDmv7I8tgXisT8ShhsRJYJu9DolqZhpD.8VWmdP9QQE3N_6o HnQlHeep47Jf__F3fcC4pbOptKvV0OmfGgPx6P1AmZ13BRLuKxgo6xZvS7ZuE3UpqQ2sKzm0VVAi QhIk84rSqtfBj10.bDb8lWEbnDt3KrKrMqJAHT7lOGGZgKTzcERkmFjAi3LviimHHQ60Iky_Ih8n lMcUG_QTJYmrihnyvC6jeZGYmwCxIq2VJ6vul7Q3PTjg5qzlaiHc2bOHRXO7AxxQisUbr_lkIAGs pw2YxWEkiK8P5ynJBKIJ9163aG46i6fgxqNfRJyvR.nf17ON9dwviAyWTaMNeujWlqvNqSdQ9ife ZDDTq.iibCmmT0SVROYer3VZUsztdlzRBl2RzLrLk0XLMUN3ffNiO2kIPQCt1aMR2hUszKErCnt1 qyTTaU5RyxxOvbyJcDB7ALJOdnCa3lDk_VSJUI_mkaVaProjmCZMDSAZOVIIgK3ZTly9fmGv56NW wWs3zZDLqOMPGi8nIXzM1jEr34mkSndSrLlwaApXdzBpHK_DBMU.kHUUeoLBb3K.3eOVIcqJEG2a b18.gdMOrxtL77g18df1y_BBLZg4FpupsitATuB6XXLBnQho5mUgitKyBOHHFlKMmsuLxebaEI7C ZSlTs9yFnz108IspNsNS9LbcCdGEoBsR7LO7FehdF9Mwp7GsUOXH8Uiu7NP9SESHdK8HupXZ4wQX 2sGcP6zA8b5w2h4VI9ci0yL_jPGDwN.fbSdkrvzN9PQvCksE3xHA0j3xnhXkaXG070TNmXEghiZZ ysuswssdUmgPnQrN.a2p7ThbyJr5XqUc34qBj.CepF05K3Jd_Fblb.sNjaxpKdaIOWk85HmjWaGl t5k0rVwRbrg0QjIsYDNaZYY7itf2gaVzkCt8NxtNypjkiHpttQQUL5CO7Fnc_uciNUarzK0lPqep .kMltx9BJ79yT.IHlqoA7Yj6Ay71YS6TAW0yx24VqsF0OTe2sRcHtafoPUdsFta_A4LUGZEPf6km vk4umy6lTd8M9qaxWVuZW6yyl1KVF.QtLDGRHyE5OjATmgOXgl0Iw0uh5F.5geOBUms.5B5s3ZIi nShR7iP5hTyXTBeBaVHQO46Sek0w3xuHczAPgbbKbqfZnGRfFlPvpy9A5WwMdkanbarCqzJY66KQ 7.4I_rm8dVr9C8JzNMF8PTDNrHS3lcJH9uPQPcdrEz42KG.M5_WMW3M5L1JbmaNtsKUNIwegCLL9 LE9FvOq.uiwYnF92Hs.uokvhdwd979F635NmSFz8bAFfhDlPG6Ize93QsSzUGD3KCy7OtRNEm X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Sat, 1 May 2021 01:37:42 +0000 Received: by kubenode549.mail-prod1.omega.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 0608947ba495a4a50866de837f3b38d4; Sat, 01 May 2021 01:37:40 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: git cherry-pick From: Mark Millard In-Reply-To: Date: Fri, 30 Apr 2021 18:37:38 -0700 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: To: tech-lists X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FXBgr3Vzcz3tZK X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.69.31:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.69.31:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.31:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.31:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2021 01:37:45 -0000 On 2021-Apr-30, at 18:09, tech-lists wrote: > git newbie here. If one has the full git /usr/src repo, and wants to > build for stable/13, what are the commands to "cherry-pick" a commit = from main > and apply it to (local) stable/13?=20 You may have to provide more description of the end result's properties that you are after. For example, Are you intending to have an automatic new commit for each commit you cherry-pick? vs. (no automatic new commits but . . .) Are you intending to have the index already have the updates to the working directory added? vs. (no commits, no index additions) Are you only after the working directory containing the source changes, no implicit adds of the changes to the index? "git cherry-pick" can do the first 2 from what I see reading the man page. --no-commit (a.k.a. -n) leads to the 2nd alternative above. =46rom what I read, the 3rd alternative is not something that "git cherry-pick" can be told to do. (git's terminology has a fairly specific span of meanings and avoiding meaning something outside that span can help avoid confusions. But it takes a fair amount of reading to identify the span involved. I learned while reading for formulate this note.) If you are intending commits, it seems unlikely that you would directly use a stable/13 branch and its HEAD and then commit to it. More likely you would create a new branch from stable/13's HEAD and then work with that new branch, including for committing. Otherwise future stable/13 pull operation are problematical. I'm not sure that I'll be of much help, even with the desired properties specified. But others may be with the extra information. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)