From owner-freebsd-git@freebsd.org Mon Jan 4 09:41:37 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 31B704D049E for ; Mon, 4 Jan 2021 09:41:37 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic303-23.consmr.mail.gq1.yahoo.com (sonic303-23.consmr.mail.gq1.yahoo.com [98.137.64.204]) (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 4D8Vy820ywz4TJH for ; Mon, 4 Jan 2021 09:41:35 +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=1609753294; bh=Z8RjxF9Efe/axqIKEgoLuZZgEEjGMWd3rIlVIO62tKn=; h=Subject:From:Date:To:From:Subject; b=YN+Y4hFI4uuCIib4Pl2+EyGzq1C+HA+UlTau4lReEHYdLw8NafbB0oA25VXrOC4i8cu323qb7h7NmH78pj6V3zEIB0feiw8C5H6FmGPz++Pdg7oPvek+riwZ/5w/EB76+zUmYpb2F0vLMfgFemqa8lEE0NqtulDgvAdXle1Q4JCkzj9Chnhmoi/i+Fetxxgsf7adzySOT3Sgb0ujSGBoHIGM0rIPD/Vq5Wt3MQpZDxIoA0kGZM3LLXQ7rmvDHqxu90xDzaPG1cLqqxxnaZeCACia0MbmHDQpqWtx4sxKwm+dT9n8n+2LYoBsqW8Oo+VEFWyaJMzYotAquidPYMwbbw== X-YMail-OSG: u.VzYmEVM1lBM0DayB0N_EY.8z17DnN5W77VsX1BLPsyLg6J.z.uzjCo_ufSXnS p6SGft_59HSAPz2FApXE8JQuGKbz6d_0C5WxG8tB8gtfkhdbqmyUXOuAAgFnUxBJI2NujtUFdHSS rS6g4dx2Be_BrgCsXRqQfvLI5FsUiKq0UL6vadhriov9Pom9.JSxz0A5O3R4lHRp6_QO3E2_CkX3 eALPna9Ug5Ix75ychVNxv6ap_OigVj2zYa4IzQeJ0qjjgUPe_IiI9FiWPEcwofjmWcd6NKSSBoTJ 4j.ZSe.KzHPuZ1CYeSI6.jnSwA3UEqdFXjsZxJBHubo5mYc87gKll7sJXFUM7VA2E7KtleWPa0tu RMQu3gKnIhBFeBVyb6gzcdMzht45kwT1H_HBcmRJT0uUgsWJ0a29KXr3QLHtWO_7FvvYSV96tzpz 42h07dbwHT1Ky5HiNM34ryptQ0BlNjXLumezwk.dOxPU6F1ParJkKXzN0M4Hhfg_oJ3Yb2sDEAhN tZt_Enahm4wa7LXGjaWxv61T4MPmSzhO_nbnpX8vkExV2Ew2leu6reuABhB7g6saqwj5IB1x6pcb CM5gfj.if9.PozuH6NZnDoHALHZO3urf7mJjTcTgrbW6dPerlCBMekUNGq696J0kHfn6bFQ5r746 wZYObj88hlDbm1VnZ4KLmFyghVbbKeRcncpH0SN.wUbAvl4l6t2AMcGNLf3PveVeK_CACHcoYGEX q8HE4P72K57XDOFAcM2W.uNEXkU3EaFfHSDM.E4WP2ip5kFuARj9fRUYFD_Y0h4FagBCGN.v1obD u.xNPkPEcMeWBt7hS6roDAIhD68OJS3pC3ZO6MtbGe6UMYccHoBg0ePAl8RgjkcjVWA7LRSoCorx ogWHP99rV4Nbp0BzCYeVONinnMy2boE4wkZAOj4SQ6FcXgpli1vJTKJdXMFZbG_.GRzSOirGLf79 pwJ5QX6bl8M_4z7Qord3hrJDfdXaiUrPSd6AK3ex2e_6VjpgIB_KzWZge_HyBKCTrLM38vLMXWJU sFxgoWuaVaToNWxyi2VPNfEcwj7iJ2X_jPrWOnhPEpDAtou0kPRG7KxJ2JSkh3ScQrbG1V2wd7xz d7RkVLuZ5z8q68f7VT5UeRAmsb6rz60JSxW27wdVFjrW6l.IV8J_VBa4ul57qGOztq0X1b10kUB5 92NoX.xvVlPPQdHx4TqfXidtG6gxIvUuD8K.1KRaWUH4Hk2EtP6m6ML3UUrpaMWNJCDJzdr6CZ3C ULwz667.0OiuoOKVWZJ3nSAi0onFE3b02D6_xA9Pb1QjVRGyRNyr.8hkk1Dp509l0Gsb89aawO1v 4GC.ZvF1q5ho6L9UaU8poCnSiU_YgDh8UftwzzMOqsh3ZynV1WtbDAf.xNE9Cl3V5p2CMDe4dMGU j7Os0MFE67yw6aE0k6.HMkY3HdL5KOwuXesTEzFdvDK_SC.97FH6PWXE0Qki7tYt.q6hECYD33UX BCHEexsESptHd5Q47ipsMoTNKuTW4dZM7IDsk5eetuNdBtfDrOKaqdwts3wf2lFHD8GxGAswv7VL nbzYNFzzFac.c4cDpSlSBR09yFgIpSu_.5BMXHgXVWZVOHgtm4o5txAPaBnglAJjZ3XaZpDpvvpr LCm9PG719Hadpk.xxNTIsZHT_DcvmkZylZ149HrvElIdbrMHoEreMhorPLY8fI0Hf2tOaDXVpXFt g4F1rIzQbB5RYQunVG9CCX0u2jyntmYj1E_4P23754YXgBB.kYakn4YiTXLobcoke4okOhBMtswX urciwk29WOhmqe.lkYzSYAcVzUFMIyG_hzxWwuYvJRQ446VrYUNJcM6RoCsxUw6Hg9KMguWOztAi 10CcRI6r.qZHllxXArO4jBXwFvpn0VonP.ALmxIvNT.Njt09kTods0.tytdC1cIGIuxmdhKP27D3 3JUd2Ttp1Adp6WjXH562D70ouEArzBRf2.kxFGhC5t9bUSEDYXuD8rQDCKnjiKuf9561QVMQCRch FxQ8rVitUSyUCna4D5ObIyRoQQBCP4Ca1QXzLYbO__AQhcQXsXnPvrRFSH.ntJpntBRCWCpI8oYz J3GC7U62Q9Ent5h13Cxq6vUl4b5N6D9n.3y2Li.3n2TvxuqdhmbFrBCul75RurLOqVz55G0nIeyo gASEthiQ69mmGA1h6Mp.xHA6Slhq0wPx3vNvqooLzc34KxHOMosv97QUhmqW2ECHeM1ZbgVJwMvm sHm3jWw12M4CkxWfebGK8DaXQgxSKKkwCUsTR0ARLtR.EJ4bs5D12j4elYogLO0jhIAE4Sl05OaY L8QL6gQHG8wb9C.Q9rEaOokhUZeyIv6hrV_rPRfDqy4hdsXqKnZFVdJ80Hc7cXEvzLpImuXylWJQ loFvhRsHYKECoMTkX8eCgDo0NoRFrAI6MOL882HIuQgICYUkBQgXvXIgxv_H1LS7dLFYYaqEoNzS b7hCTcDI7NPM_Qidf6FGHMPF8UzaB55PCmAcvs0gejqZ3EQEHMaq3QHDDOYQttcR.maulu03GFg3 KYhUAPeX9xfO4SiB0ppysY2GuV8AULA-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.gq1.yahoo.com with HTTP; Mon, 4 Jan 2021 09:41:34 +0000 Received: by smtp413.mail.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 8260c818b305e50fbca55837c16ca830; Mon, 04 Jan 2021 09:41:30 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: Reporting context with list submittals for defects when local git branches are involved: needs a new description? From: Mark Millard In-Reply-To: Date: Mon, 4 Jan 2021 01:41:29 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <29E9AA04-C66B-4298-B84D-6549A88C038B@yahoo.com> References: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D.ref@yahoo.com> <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> To: Ryan Libby X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4D8Vy820ywz4TJH X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.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]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; SUBJECT_ENDS_QUESTION(1.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)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.64.204:from]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.64.204:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.204:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.204: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: Mon, 04 Jan 2021 09:41:37 -0000 On 2021-Jan-4, at 00:39, Ryan Libby wrote: > On Sun, Jan 3, 2021 at 7:23 PM Mark Millard via freebsd-git > wrote: >>=20 >> I use a main context here to provide an example of the >> issue. I'm not claiming main is the only context with >> the issue. >>=20 >> Taking an extremely simple case where I'm targeting the >> head of what git fetch freebsd provided, with my local >> patches (re)applied via rebase: >>=20 >> # git reflog >> c9819aa7b91c (HEAD -> mm-src) HEAD@{0}: rebase (finish): returning to = refs/heads/mm-src >> c9819aa7b91c (HEAD -> mm-src) HEAD@{1}: rebase (pick): mm-src = snapshot for mm's patched build in git context. >> d03fd8ede2c4 (freebsd/main, freebsd/HEAD, main) HEAD@{2}: rebase = (start): checkout d03fd8ede2c4 >> . . . >>=20 >> One could imagine that I'd picked to work from something >> older than d03fd8ede2c4 (say to avoid a known problem). >> Either way, uname returns the likes of: >>=20 >> # uname -apKU >> FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT = mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 amd64 1300133 1300133 >>=20 >> (I've been experimenting with reproducible builds but that >> does not change the point: The identification ends up being >> specific to my local branch, other than the 1300133's.) >>=20 >> Thus it appears that the: >>=20 >> # freebsd-version ; uname -a >> 13.0-CURRENT >> FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT = mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 >>=20 >> historically used is not sufficient when local branches are >> involved. >>=20 >> It looks like something like the partial git reflog showing a >> relationship to a freebsd/main or freebsd/HEAD commit is >> effectively required, or at least some wording like a "based on >> freebsd/main d03fd8ede2c4" is required and no tool currently, >> directly provides appropriate information: it is a manual >> operation. >>=20 >> Food for thought. >>=20 >> . . . >>=20 >> _______________________________________________ >> freebsd-git@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/freebsd-git >> To unsubscribe, send any mail to = "freebsd-git-unsubscribe@freebsd.org" >=20 > Does this show what you expect? > git log --oneline --parents freebsd/main..c9819aa7b91c >=20 > Or for just the "merge base" commit: > git merge-base freebsd/main c9819aa7b91c >=20 > Yes, we should document something like that for filing bugs. >=20 Avoiding the manual lookup and typing of c9819aa7b91c : # git log --oneline --parents freebsd/main..mm-src c9819aa7b91c d03fd8ede2c4 (HEAD -> mm-src) mm-src snapshot for mm's = patched build in git context. # git merge-base freebsd/main mm-src d03fd8ede2c493d0c5a74b625a93a48e018515e1 The first automatically identifies the commit in my mm-src branch, even if mm-src later gets a new HEAD. Having such recorded in a problem report could be important for the originator of the report (but possibly no one else). Cool. Thanks. Showing a more complicated example that also involved reverting a couple of commits so that the loader would display on a amd64 machine (a default text mode context): # git log --oneline --parents = freebsd/main..mm-src-2021-01-02.avoid_framebuffer_console_change 2c557eeab90c ff4c62fe5612 = (mm-src-2021-01-02.avoid_framebuffer_console_change) Revert "loader: = implement framebuffer console" ff4c62fe5612 33700671c435 Revert "loader: fix build on non-x86 = platforms" 33700671c435 486580c44ce2 mm-src snapshot taretting just after = conversion to git. # git merge-base freebsd/main = mm-src-2021-01-02.avoid_framebuffer_console_change 486580c44ce29c1e3b1d9b858a08d9df9428b699 Here only the last line of the "git log --oneline --parents" has an identification as a freebsd/main commit hash and only the first line has the long-branch-name's "at the time" HEAD identifying hash. But knowing about the reverts could still be important information. Adding a named branch that would not get its history rewritten to go with the defect report might be important. So in the mm-src example context earlier, I might not actually use mm-src directly but first create a mm-src.defect-description branch from mm-src instead and then report via mm-src.defect-description . (More to think about.) (I've been doing things mostly to experiment.) =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)