From owner-freebsd-git@freebsd.org Mon Jan 4 03:23:51 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 AE1EE4C90FE for ; Mon, 4 Jan 2021 03:23:51 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic308-8.consmr.mail.gq1.yahoo.com (sonic308-8.consmr.mail.gq1.yahoo.com [98.137.68.32]) (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 4D8LZF2pvkz3QYR for ; Mon, 4 Jan 2021 03:23:49 +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=1609730627; bh=qnP+hFKpXStMSw2gWyCF6gazFo02U7tMIBQrlP1h9RS=; h=From:Subject:Date:To:From:Subject; b=Ce/7hMvv8uVVxXFZ0EQdGa5M7KSZrG0SafCL8RCptwhsCtP8HRx545rodclIy7ts3OLTWgpJ/Cr44U9La1hrY8elw5ptnX3z5QM8RQex9GocN73z4hxT3hEwZqLDSGI+8MAxnGPfYPakCPgpatxCs44yXYfrBioyry3Ma+qh4W+BALTW+HIHQSTHjLsoD28xTsC5FgdjCxdPWfIXm7yLPdKvB+8Nn6sw46ctm2TeDMUPrZrXpxquUWmfv9Yl2mJoGhZBbHt4qeHzPAWCvdnJshYNjEWzlZ1aHnuBMjQQjB4/Zzj1VnIJJTc3Hs6fvvABk4ebLf8arihcdheFebTBQA== X-YMail-OSG: Nseay3AVM1nic_ESqwe8xLLQkXGH6OFAjZO7YoDVSNPGE1UqAd2aoaG.jr2BEq4 CS0qS_yLCG0llxC6KymjOVp.mx22tgrWO.zoRQBtePrRA61mWweJuDXyrEY51t9NCpDs74Hg0218 6lMbuvsnNrm7urOqPiOAZJpdcW_fyC0bNJV2XNb1HEDrLxZK3tDsRc86RVw8fk_1PLyu5kx7uu4D ezijqD7KmdOs7SHNS8EpMjxlbRu8HuCa5U7hwvcsjrBODG4hcRURf0uFNZUpsXRmhG2HNN.TQJxn I47hx2nQEqkVfMyBjx3oNT8ZwDlUkz5zYz_zI4v58oHGtI6a1GIMhpcEcbMUa6S2kfkImf3EE.RV wQ8A9GB3ARzyiw_GdDudbj2TmOX.PbEPSVeQBUDamZxs93AARYPQS6nJ3_BHnNFqoy5uHNzxVuzL 2MX5jAUtQyM1Ov7juKach.VzMCM04oKaXrvPSvTOzkjYXoD3rXPL6wPMx5QeDSlWWzhtU0AJxS82 DXBbrEFkHowT5lrx0qmp4oq7hK53crUsjx_F1QERwnEbPiQ6WUBDLgvWwvpKJWQJ2uyPZlJ3R830 wOEPx7npd6scXW4CIP2M8ytKIhu3cYm949_Y3lWaenKHssxGw1VCS2ApTEIc5G4Yd3BsZrkaYuy_ MhWBxYzmsBvL2XWs436YjuBEQpVWALKKp1qzmA3CL8QD5kMCPr7tHNMU3RIg49qP5ZDq.XlfAuHn 6gkR_AtyOqpVRtL_8LdxTSoPa9ya7HynrY7wqxQ_MFhl4V0zz7sS7TKfS9YZ_EYApbzAJb.erdXR 3PgQPDEW6ehiU8OKTVfynKipNMQymSM1.oTZhuxMr6_2mwnuR1IRypXaX4Al8l0aTsc2zxvVPxGX uJFPNI2VmG1dleGK2mwSnapcEQwNDYba.3DYtKaoNLMxgkRvknwuiFBFdxh2G2WVe224LnL7OTFj yOy.h1sQ2kgQPPQaH2EQ2D19Dg0tBFUXcgpMvaydGS5uSDu_O6QRYg_fKrCqGSbGnzdJHiFSlW_u hfsy4gIwWVKIbo8CMxk9ftwr_GLsG3uQIEYjn603slVVG.05_DUIWftZnVyFa4cWskbWH81FV3lW BSnAdyzkAkgWtQc_wrh0Bnf37jjEgibfqLutXerCaermlQWhBrcxAuUB9JY1JDks.1VvjQw8S6JE S.GXV0ahbnZN1HVaJdmLAGV4pZQ1Egd5TXLWKrqwqOyByTPOY3qtSianx7N7P_MJXKGnRfYzZJuJ vQgKJCV3.sug0uBnuNJRCT3VTMkCAjoyyRecbLlKcaWV4v1deHqbuZtSxbRBDn3qV8uZP_QG8vUG 7k63kGoP0vK0XnAm5E59bnhIrIpVepc4.Dla4DKARqC830KOEq6732r6NYJ9XPxrRF7ex8vFNqM2 SDvGH2aMbr3.1PgNXRKjTyhhMsd42UimNDx5YXFSYBRMUZmMBFUR20gnuA1B_ue9JWxYOeA0tSao p.Od6kBzRRkTUE4TjhX2Ejo0TPVr6lfIpPfyX6XVltj8SqqlJC1zX_g9Ch16fyMcE2tWxkb5lyiY 5N.UUtlpBGIvOgQ_er_5pxG97GRVrpMf9r7UNK6Je_.fmDijcsWh.BnPhm0gRVG.W25aHeE4stvM QVewTLParkhmIrldpFGB8k_HhvZ3sccQTXeXDPhnk_Ens1qm2MFM2qfBk46SsLgFfcJdyNKcyALz Pbh0pxVNpjsxFEUNa3u.uHUyxZoXHj9htMblHRiZehrqnna2JXJaKNaP.tzrnEidbz5Iob6Hrh_b GWuGRCPT40frC_1U2nSJmD7HeAAqNA1CUUBKIQB3Sw2QEkpzQljQOFuSzY1GwzT_jnyj34wMtnr0 CvPAK0aTf5LNK3qc_2HD4i.5wlLDATTmtcYHEoi7hGiBE2NhGCpKZnNm5TsMIgJGWgsXN2aCrz_C O2NwsUAqG7ImWcBEpamPI1YaqMLKOpRvCJoJNuiXeGZCHsaCYXTNtyqcPfp5ox6u4D16lUx8YdJ_ aonLSEPLxAr7Ywclz8BbNPJnY0uSbpWftyfeDQGQMizavrfSv8vKBJwPLa51aNftG8rpFjYkMFXj IWAmvrlSCEe60sIT8g9F5zCGygLh3rK9YGrVL35ZsS2AbBNyGtQVfGrk796oWSv42PE5ZR0WNORf srbqYhhDugp.PzQ5M9VQ1WaIAimnkB0chgAhyBopgtNo1krWP6YrsB8UevS8_Z5Tw6oOGnuA6fQy PEv3uXoJNDKiGBqnFEfBlN1AiGY2amEGtLhYP.kyWwP5Anh01ai3G7AEQoryzQ5gQJ78Q8matHJt SinCU9G.pRMyGGMjAHDgb7nB6DPIU8iMR.DAc5rMfUvyLY8MFvyg6F1MpBvpJu7K4rCQ1Qhe5BnB VDwTQrLNlDqaa5cyXSdl4vCnuPlGX6478vN2Y8ozAhHjdpEtauW9sMdy5YtARJrqecSMsFuMtRgf bbuuKNiDeuiU80Up35TtzP_fF0CsdlQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.gq1.yahoo.com with HTTP; Mon, 4 Jan 2021 03:23:47 +0000 Received: by smtp420.mail.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 71c1124034ea4e122618549741b5b579; Mon, 04 Jan 2021 03:23:46 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Reporting context with list submittals for defects when local git branches are involved: needs a new description? Message-Id: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> Date: Sun, 3 Jan 2021 19:23:46 -0800 To: freebsd-git@freebsd.org X-Mailer: Apple Mail (2.3654.40.0.2.32) References: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D.ref@yahoo.com> X-Rspamd-Queue-Id: 4D8LZF2pvkz3QYR X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; 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.68.32:from]; 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]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[98.137.68.32:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.32:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.32: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 03:23:51 -0000 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. 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: # 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 . . . 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: # uname -apKU FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT = mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 amd64 1300133 1300133 (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.) Thus it appears that the: # freebsd-version ; uname -a 13.0-CURRENT FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT = mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 historically used is not sufficient when local branches are involved. 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. Food for thought. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Mon Jan 4 08:39:18 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 9DCD54CEBD6 for ; Mon, 4 Jan 2021 08:39:18 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8TZF5Dbxz3vfc for ; Mon, 4 Jan 2021 08:39:17 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: by mail-qk1-f171.google.com with SMTP id 143so22736280qke.10 for ; Mon, 04 Jan 2021 00:39:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WO753OjVy48cxC5IH4+cjRxegBWHXp/Fgl/EsnEAEhA=; b=t/pLYkxsjGgbMP9h5DYPqdzDtZNz0v0K/baOyJKN0QQm7OqSEiudCRPtPM84+DN1yJ tEVQPs7C7JHwYTCcvkjdzD7onunuRPr/zkXqzYv9IPVjo3kcqbr4iON06s02wBXVS8Qr fCrVbfeXxNkFd1be+lIOTqvt4HgE6VzKU0S+r58or11RnyfWq1BF4iMC42Q6Pl/g0Rui //dRmp5a8cNvDbUOSrZT2Phuoyo1iyVBw06nl6YtKBgIQHsqtsMLComTqVFc4orsLu6U 4HchlTPv2DlrzJqgY0cKGOo7locmx5KdyGnubVuoKeWS8YtF6E9xs5SuY2krJ4wtNE4W kzAw== X-Gm-Message-State: AOAM53233ogFdP4jgY1yBGQgWJyR+6V6gbuQz8PKYYl4GETPjxVP/L+o K7rRPY+T4qlq/f01YlYBcRwWN538kCc= X-Google-Smtp-Source: ABdhPJwKzXNLEIFytnY8hZ6jjm+b602s8d5nPtT8lco6o2eRkqEfuOkjJBr3CKgUDf8KA5LHZlJLTA== X-Received: by 2002:a37:9dd3:: with SMTP id g202mr71648847qke.488.1609749556625; Mon, 04 Jan 2021 00:39:16 -0800 (PST) Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com. [209.85.219.50]) by smtp.gmail.com with ESMTPSA id c136sm26547448qkg.71.2021.01.04.00.39.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Jan 2021 00:39:16 -0800 (PST) Received: by mail-qv1-f50.google.com with SMTP id az16so12650776qvb.5 for ; Mon, 04 Jan 2021 00:39:16 -0800 (PST) X-Received: by 2002:ad4:5762:: with SMTP id r2mr76368779qvx.45.1609749556123; Mon, 04 Jan 2021 00:39:16 -0800 (PST) MIME-Version: 1.0 References: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D.ref@yahoo.com> <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> In-Reply-To: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> From: Ryan Libby Date: Mon, 4 Jan 2021 00:39:05 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Reporting context with list submittals for defects when local git branches are involved: needs a new description? To: Mark Millard Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D8TZF5Dbxz3vfc X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of rlibby@gmail.com designates 209.85.222.171 as permitted sender) smtp.mailfrom=rlibby@gmail.com X-Spamd-Result: default: False [-2.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[yahoo.com]; FORGED_SENDER(0.30)[rlibby@freebsd.org,rlibby@gmail.com]; MIME_TRACE(0.00)[0:+]; SUBJECT_ENDS_QUESTION(1.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[rlibby@freebsd.org,rlibby@gmail.com]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[rlibby]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.222.171:from]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.222.171:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.222.171:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.222.171:from]; RCVD_TLS_ALL(0.00)[]; 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 08:39:18 -0000 On Sun, Jan 3, 2021 at 7:23 PM Mark Millard via freebsd-git wrote: > > 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. > > 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: > > # 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 > . . . > > 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: > > # uname -apKU > FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 amd64 1300133 1300133 > > (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.) > > Thus it appears that the: > > # freebsd-version ; uname -a > 13.0-CURRENT > FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 > > historically used is not sufficient when local branches are > involved. > > 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. > > Food for thought. > > === > Mark Millard > marklmi at yahoo.com > ( dsl-only.net went > away in early 2018-Mar) > > _______________________________________________ > 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" Does this show what you expect? git log --oneline --parents freebsd/main..c9819aa7b91c Or for just the "merge base" commit: git merge-base freebsd/main c9819aa7b91c Yes, we should document something like that for filing bugs. Ryan 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) From owner-freebsd-git@freebsd.org Mon Jan 4 16:28:19 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 072564DB654 for ; Mon, 4 Jan 2021 16:28:19 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8gzQ4Yh5z3Fw7; Mon, 4 Jan 2021 16:28:18 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 104GS9qU086270 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 4 Jan 2021 17:28:09 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Mon, 4 Jan 2021 17:28:09 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Mark Millard via freebsd-git Subject: Re: Reporting context with list submittals for defects when local git branches are involved: needs a new description? Message-ID: References: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D.ref@yahoo.com> <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> <29E9AA04-C66B-4298-B84D-6549A88C038B@yahoo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <29E9AA04-C66B-4298-B84D-6549A88C038B@yahoo.com> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D8gzQ4Yh5z3Fw7 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] 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 16:28:19 -0000 On Mon, 2021-01-04 at 01:41:29 -0800, Mark Millard via freebsd-git wrote: > >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: >>> >>> 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. >>> >>> 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: >>> >>> # 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 >>> . . . >>> >>> 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: >>> >>> # uname -apKU >>> FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 amd64 1300133 1300133 >>> >>> (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.) >>> >>> Thus it appears that the: >>> >>> # freebsd-version ; uname -a >>> 13.0-CURRENT >>> FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT mm-src-c255571-gc9819aa7b91c GENERIC-NODBG amd64 >>> >>> historically used is not sufficient when local branches are >>> involved. >>> >>> 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. >>> >>> Food for thought. >>> >>> . . . >>> >>> _______________________________________________ >>> 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" >> >> Does this show what you expect? >> git log --oneline --parents freebsd/main..c9819aa7b91c >> >> Or for just the "merge base" commit: >> git merge-base freebsd/main c9819aa7b91c >> >> Yes, we should document something like that for filing bugs. >> > >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.) I'm a bit confused as to what you are asking here, tbh. Are you working on a branch of your own? In that case, a bug report needs to have some concrete pointers to what you've changed locally, or you need to revert to a clean tree or something. Or do you just want to have some minor things modified on your tree? In that case, maybe using git stash and git rebase --autostash would suit you better? Stuffing ever more information into the uname output or version string isn't helpful, because as soon as you're 1 commit away from mainline, who knows what crazy stuff has happened in your tree? Cheers Uli From owner-freebsd-git@freebsd.org Mon Jan 4 17:27:22 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 07E2C4DD768 for ; Mon, 4 Jan 2021 17:27:22 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-20.consmr.mail.gq1.yahoo.com (sonic306-20.consmr.mail.gq1.yahoo.com [98.137.68.83]) (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 4D8jHX6CZ0z3Lmt for ; Mon, 4 Jan 2021 17:27:20 +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=1609781239; bh=tGO/tngWWUrTMrllc6+6WQMns48/jNk2ff8ffSarxue=; h=Subject:From:Date:To:From:Subject; b=qcDifEEt3EZB9UvHGShKZL3JNJK0zE6nTu5P5iuxHIf4cVkpPDYWS4l4e9gWHRXSktbDn+uHniXe8/GSMjlBwjRADBQiIgL1olHfp6QkwsMg2dnnUoGfr4gGlNOXiOpUWIe1dxG9ncqmDiXinlY1rJgFCgbGg6qjTBQwMaejK9AH0f3iIFC0w2qbn/n9KuV9h3pfaWCIOZaHvz3b542QlC3gmQQ34S5vpajLBbB0louCfyPxg0UU/cQlnDRU9Xvn77k9D6fQAcCwtyk5/Kf9f9qJKBVw9YyiujCv/DCGYT4kcigxcv3VmjY9rOk7RVoOt+j93usCiWbjquy7bVp5BA== X-YMail-OSG: zE3FipAVM1nE5Sq4qCCHicpqmsmf23_Ced3uWkWmO1_oQqejQ9l.XXVZysC0_mb 4IjC1A2lnuzwkoS0k0jWfOy4_8aveda0PAGV7HLQhavesiEnytzXmsZtz.dlkwMfSF6.1nLVSdfs h4VquV6eFcnlAbmpCZ872E16r.MsaspEhxaqo2QsvcestLX.jfwH5IgHYdI9FNkq2UTtMQhUeSh5 315qDiWtLp0vdrzaPTSQNMNJCtREgp40XHaZFRug7h8UxcQnmzJ.45v4ZprH0P42_Ucsecat3SNO bVB4MNeNNPL3S8qs_pBI6HG6CIa6ksVPH8zOqXt02NJm8IBseUFlgvccsFgku41CIbfkDtSlysoe 76FmW9W6bUVt5rXlKyX3GnP1BDwjHAVNriQRBNOww08aRDVZt3Nz9c6WAJ7huY2NgTRbTL8MLeVg k8KCLCs987Sfvp8BLT1WIdH54rqnefzEprY5.jHcOWgv54ipCMpIXFb5Gz07cHO4RIsYZM4ecXSu rSINJyKy9FOThcA9zN6VsDHMz5ITz6jhvvk1OBF.wCvFVPP.NdleWw_gasIGB6lN2_EuaDwYhVjW ESQuHaczcccc_uiQsKj0uhdQG5wl6P2LOBK0pk2CJncI_1uDIyR8ZXKcwgVciU6ldqeIwPlv.gXP PmfIBsK.BQR_OGnCsM7dmPnm_oApOwUgDTkesFTVpE5TowRJA84_xdyr5qoadxc7HVyPX1PRtHvS wx_pnBoyUII8rHGgAZZ39rOkPZ.VlUMxt.HxEgTn1HJnjVwN2R1_5SAskJG8fuYMb0be.Nq2AHgj IGepsEO3qX1NfI8p9qlNZ11QKG3DvoJI3WnDc9SdysW5S_ap64HkNiN7VttUwPNotKtpMcWKi.pa bLpDiUAn4JLKXknKE4Ns0R3jV1Kf.aYTET.iHvZ3nLUa6x0lyqELRb8jVaxltrBnJxLuvJ8r5.xq o5aCTCrneDi..Q5DYknwnOxZnYN1xgIQ19PAw4AA1pELSs5LNlj7fTGy5Bizx_8PVCL1v_UOWbrb XIV5BHhR30fqR7CQqTPOOAu18rOiR1_OSIPgyXyYyk_2cmv2S1IY2YRSNvq56aP8LFCuXhd3Qskk mbpTOraFq4RHKIF.NrJ3GA540cM5VTxiZgdYpaaPT_KvIh7Fth_KCuAkyJWeoIrRoGBMZWKVoSSL kBpHnQmlkT5gALRGeu9QSy2SSUzBTnB5jSTbj0gz2CEsyslU7ZUOmffFBftResixqYQc2apo66yp bZQ04w0ShFTtl9FAM4GIZBHd2ds.6rTVDAaS05N_nyPg1zbXXpurelRthfghV2QG7bQjTLT3i9GV h1IIHV9zVlZp4iSiDfv1upxuMrYxY4a9e_UnVPpfDMZkKYRn3OPwRLViE0EXU0LUYefrZVNIIVVX wkayAhoTszlcLN_r4nKBsZ.QgwHJ1eY8717CNmsFOHIWRZFzwXLv9YYZQ0gpDbOTsy3BLH9Orm7V ALDw1zPMht7kJXVnTlye.kT.CjeAvec0XmHwptAo07FCIdwdmQn0pr0X5Eu9tQDMezesze6odnlP Tti.T1xZKJKq66dv.FkEgEkw9.W6FTESa14zIxekV8cMm2_aKZ7LXuhi4ije_YbSleYKzYksF.ps Gbpo4xr08382TFpS2ZtCANgyZ.sJSUCRzuXoXcwYC_48Bnj5JRHqHonr7npQhkp1SJeh8SmTi07M .giGXO_19Zxx.MBZZQBRMI6.qpn7wuXwUGDRvm97vDGFvH3_FPnZMMw.5LSJYrruxt5Qc5A_8NGT Udejj9Kx7HDwiPlZkcBuhm07NY5uDvex6ceLskLCSadG8qZ0sMqbGsvVaXtj2bhwvEyInVHSY1rv oVuh7fGmnNaEPA3D2uINFPArMfEAtDlwUuQ9mpipzODattVmbCwjJcyLxks2ljVOqYdIPqm0dcn. wFq2C5HcpvDBaElZSuQqEtuXaa7AL.CDJ8xQF6xnqsl9kt7tY4nNtwXpWrKJBnqjnHgqPuQFOYiY 6rbjvGglVpGWQnkfBE_B3a6012XxpJO8hpXtlaWBGdJ9JZw1AF9BVSEDLZWXxYzWjxK_Dm.9XYkJ RCkuzQYI_qgZyTuWFqdi8vAAGezvDWQtUb5DPys5K7cFR86aqmbZf1nFCcI3U0m3SWEUZtxPD7Op KMVQNqv_faOmXMFoJqlMEvNSTMpBiAuFfQ2D102claZSJRvi32iOzxpB_Y8P64YH2a_68e4OYzHf Ze_dXAnh6aCUlk4ZL442wFjMsps8tbPeIZdlodA9wm5xKtX07UkMUnP9Gt.CKX9rL4hFMWwZef.m t13xUyH63TNNR90pDB.jgtZNcthG8wVOVhZ29x4EU82wbwe0n9pUIKBxsVV5Yz4I5uxtAoiObFvR _uFiDcb8jQW0pkZmeNKO6wZtFyDUY7AVSLnJ8jT4UClj1L6c0z82AUrsU6y5VBoNSCBMEfPVvweW YKPAvA5EgVF0e4KauAXNSMrCCmzGLF6HAQDIdddYbiP9ypX9X5kFiHU6Pc9Rd6.0xFeTGJy4DNPQ gH3MaopJ2qSjg5bEwFArcLp42lWlrIoq2NketrZuKhMC_BFD7GLsi5cpHOJTVp6Lpy3XJyX0- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Mon, 4 Jan 2021 17:27:19 +0000 Received: by smtp416.mail.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 7e3cbfb90d188c3745d98e5cc798c3a7; Mon, 04 Jan 2021 17:27:12 +0000 (UTC) Content-Type: text/plain; charset=utf-8 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 09:27:10 -0800 Cc: Mark Millard via freebsd-git Content-Transfer-Encoding: quoted-printable Message-Id: References: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D.ref@yahoo.com> <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> <29E9AA04-C66B-4298-B84D-6549A88C038B@yahoo.com> To: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4D8jHX6CZ0z3Lmt X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_DN_ALL(0.00)[]; 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.68.83:from]; 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]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.68.83:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.83:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.83: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 17:27:22 -0000 On 2021-Jan-4, at 08:28, Ulrich Sp=C3=B6rlein = wrote: > On Mon, 2021-01-04 at 01:41:29 -0800, Mark Millard via freebsd-git = wrote: >>=20 >> On 2021-Jan-4, at 00:39, Ryan Libby wrote: >>=20 >>> 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 >>=20 >> Avoiding the manual lookup and typing of c9819aa7b91c : >>=20 >> # git log --oneline --parents freebsd/main..mm-src >> c9819aa7b91c d03fd8ede2c4 (HEAD -> mm-src) mm-src snapshot for mm's = patched build in git context. >>=20 >> # git merge-base freebsd/main mm-src >> d03fd8ede2c493d0c5a74b625a93a48e018515e1 >>=20 >> 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). >>=20 >> Cool. Thanks. >>=20 >> 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): >>=20 >> # 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. >>=20 >> # git merge-base freebsd/main = mm-src-2021-01-02.avoid_framebuffer_console_change >> 486580c44ce29c1e3b1d9b858a08d9df9428b699 >>=20 >> 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. >>=20 >> 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.) >>=20 >> (I've been doing things mostly to experiment.) >=20 > I'm a bit confused as to what you are asking here, tbh. Are you = working on a branch of your own? In that case, a bug report needs to = have some concrete pointers to what you've changed locally, or you need = to revert to a clean tree or something. Old PowerMacs do not work sufficiently based on pure FreeBSD. But my workarounds are genrally not sufficient for committing either. (powerpc is the primary context that lead to me having some patches. I'll use it for illustration.) Many problems have nothing to do with what I've patched. When I can, I instead report based on instead using artifact.ci.freebsd.org material and its behavior, but some bugs do not show up in debug builds or the PowerMac support problems make this not work. In complicated cases that allowed it, I've reported both from using artifact.ci.freebsd.org material and from using my patched context, in part demonstrating that a problem exists in both but providing additional evidence. > Or do you just want to have some minor things modified on your tree? That would probably be a reasonable view of my patches accumulated over the years, patches that I bring forward as I go. Adding a new one is fairly rare. > In that case, maybe using git stash and git rebase --autostash would = suit you better? A possibility, but I'm exploring alternatives. git is likely to lead to more people having local branches involved in how they choose to = operate. That in turn may lead to more reports based on such contexts. My = exploring may be an early warning. > Stuffing ever more information into the uname output or version string = isn't helpful, I did not ask for changes to uname or the version string. I just = reported a type of context for which some other technique seemed to be needed. It may be that FreeBSD will ask folks to not report based on such local-branch contexts, that is not for me to say. So far the "git log --oneline --parents freebsd/main..BRANCH" suggestion by Ryan Libby seems to cover what I was wondering about, including being fairly automatic, at least if it ends up being viewed as an acceptable procedure. > because as soon as you're 1 commit away from mainline, who knows what = crazy stuff has happened in your tree? I understand this risk but the powerpc list has been dealing with my patched-based context for years and some of what I've done has had some variant committed to address some of the PowerMac handling oddities, including one for avoiding frequent boot crashes on G5s, the most significant behavior improvement adopted from my patch efforts. In reality, even when I had local source changes never put in svn or = such, my patches were normally involved when I was not reporting based on artifact.ci.freebsd.org materials: a "dirty" context. Having git = branches involved does not change that. I would still report based on artifact.ci.freebsd.org materials when I can. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Mon Jan 4 19:46:39 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 1EE8A4C8580 for ; Mon, 4 Jan 2021 19:46:39 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8mNG6JcGz3tRY for ; Mon, 4 Jan 2021 19:46:38 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 104JkaQ8098334 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 4 Jan 2021 20:46:36 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Mon, 4 Jan 2021 20:46:36 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Mark Millard Cc: Mark Millard via freebsd-git Subject: Re: Reporting context with list submittals for defects when local git branches are involved: needs a new description? Message-ID: References: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D.ref@yahoo.com> <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> <29E9AA04-C66B-4298-B84D-6549A88C038B@yahoo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.2 (2020-11-20) X-Rspamd-Queue-Id: 4D8mNG6JcGz3tRY X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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 19:46:39 -0000 On Mon, 2021-01-04 at 09:27:10 -0800, Mark Millard wrote: >On 2021-Jan-4, at 08:28, Ulrich Spörlein wrote: >> >> I'm a bit confused as to what you are asking here, tbh. Are you working on a branch of your own? In that case, a bug report needs to have some concrete pointers to what you've changed locally, or you need to revert to a clean tree or something. > >Old PowerMacs do not work sufficiently based on pure FreeBSD. But my >workarounds are genrally not sufficient for committing either. (powerpc >is the primary context that lead to me having some patches. I'll use it >for illustration.) Many problems have nothing to do with what I've >patched. When I can, I instead report based on instead using >artifact.ci.freebsd.org material and its behavior, but some bugs do not >show up in debug builds or the PowerMac support problems make this not >work. > >In complicated cases that allowed it, I've reported both from using >artifact.ci.freebsd.org material and from using my patched context, >in part demonstrating that a problem exists in both but providing >additional evidence. > >> Or do you just want to have some minor things modified on your tree? > >That would probably be a reasonable view of my patches accumulated over >the years, patches that I bring forward as I go. Adding a new one is >fairly rare. > >> In that case, maybe using git stash and git rebase --autostash would suit you better? > >A possibility, but I'm exploring alternatives. git is likely to lead to >more people having local branches involved in how they choose to operate. >That in turn may lead to more reports based on such contexts. My exploring >may be an early warning. Ah, sorry for being dense earlier. You are correct in pointing out that it might get a bit harder to see from problem reports what exact version a user was running. I feel that typically we ask of users to upgrade to latest current or stable anyway before reporting bugs, so just the information that they are somewhat up to date is usually good enough. But we might have to do something smarter in the future, indeed. Thanks! Uli From owner-freebsd-git@freebsd.org Wed Jan 6 01:28:04 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 8DC824D96BD for ; Wed, 6 Jan 2021 01:28:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D9Wvm2Xg3z4Swq for ; Wed, 6 Jan 2021 01:28:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 572094D97E0; Wed, 6 Jan 2021 01:28:04 +0000 (UTC) Delivered-To: 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 56DFA4D9737 for ; Wed, 6 Jan 2021 01:28:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9Wvl2zK9z4T4p for ; Wed, 6 Jan 2021 01:28:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82c.google.com with SMTP id z20so1202423qtq.3 for ; Tue, 05 Jan 2021 17:28:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=NpYLJGZF3YA/wwJiwng/9L1VzBzFq837MEJj1LnGMk4=; b=2MyY48yktFcghcVriMLE4vHPKIAnL2XKXv2moB6PvH+ntuvUfrYyWcpABPlsYYyDvF Q8jkIqQ7UdS14AAYa/PQ4V19lLTrlEH0CHYWa1G+BMey8F+FvDMBxbNKHfepuJfYdMpK ziXi+cDBAYCEHE3+KyH+EAG8VGKszSo+nETN6Gtz8bNBLj7KOwdXu3zZGyXmjBm6HFls sIxyWC2q+dvDFTzxlII292HHdfPfDgOzrvGVshzgDeMIIK1W93qhMXD7r4AIj8dMoCfY a2bY9g+A6kItDpEksIOqvbIQnwG/AKwzZHfOLk+sEOSGgw7TipO5qFfWMkia11jFoNb3 A0hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=NpYLJGZF3YA/wwJiwng/9L1VzBzFq837MEJj1LnGMk4=; b=f9v3od8BveO4zt55yq8VPbFQMM8Jic1d2fe95R4UkduOSr1l0A1aezQikp/kayZqqN aX7knbuOqzA3eMYcUpItDKMFmoqVhnOtPS7GvhuMITk22wMFK3JbL0eC4fbnZqv81ob5 6BpnHxe/5wjATvUOISttQ6mg7waaP1H/TN2AojWIm0ZPQsRzPNjo+MGZ1GHoUnaRLTTc 8IuNZQJP+4t1Vi2098BrGNwjvR2iz0O01i7EcCV1OanMUndMKvEHzA6PI/v0aMZHbT0d 97qX2f8SUYA4Hh5fd/O7/wZ8CeZQ96DXGwdEzOSDe6WxYM1vTmfPS9Y9e4EvhTklHJ20 m3Vw== X-Gm-Message-State: AOAM531A6Vjd6fACblK8twLYBAnl3cyXJt8O33l1nsFMekL1+d1KODJY c5s1GEym5W6+oCSFqRPGWHtqLpx4+X2sLYTfQ7tWQpTm/rFhTbie X-Google-Smtp-Source: ABdhPJxCT4VfCT8TLF0IbnLYahdw3eWOWdaaD78sW2vsj2Tt8zN1cLrzCDcgfULhwgA0aTWHAAIVQUrIZ4HvPzT5Xb8= X-Received: by 2002:ac8:51d8:: with SMTP id d24mr2125065qtn.73.1609896482155; Tue, 05 Jan 2021 17:28:02 -0800 (PST) MIME-Version: 1.0 From: Warner Losh Date: Tue, 5 Jan 2021 18:27:51 -0700 Message-ID: Subject: Git status update To: git@freebsd.org X-Rspamd-Queue-Id: 4D9Wvl2zK9z4T4p X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=2MyY48yk; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82c) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_COUNT_TWO(0.00)[2]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::82c:from:127.0.2.255]; DMARC_NA(0.00)[bsdimp.com]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82c:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::82c:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Wed, 06 Jan 2021 01:28:04 -0000 [ note: bcc'd to developers@FreeBSD.org, followup to git@] Greetings! I thought I'd give a brief update on the git migration, as well as clarify a few important points. Basic status: We've cut over to git. The source of truth is in git now. All commits go into git. Minor issues remain. A number of project processes depended on subversion. Most of these have been converted over, and new ones that are discovered are being converted when found. The git2svn replay has been delayed by illness, but should go live in a day or two. We will be replaying git commits to stable/11, stable/12 and the associated releng branches into that for the life of the branches. We will not be replaying into the head branch in subversion due to logistical issues. We've restarted mirroring to github, gitlab and other hosting services popular in Asia and Europe. The old mirror is retained on github as freebsd-legacy should you need it to migrate to the new mirror. The old mirror has stopped being updated. The git working group is looking at ways to enforce better dates in our workflow. Other projects have various processes in place to ensure better date sanity. While not strictly required, it can be helpful to have good temporal consistency in a way that's not a significant source of friction. Mark Johnson has a script to streamline phabricator and git integration. This allows one to create a review stream from a branch with multiple commits, with automated updating of the commit message, reviewed by, and updating the review itself after feedback is applied. You can find it at https://github.com/markjdb/scripts/blob/master/git-arc. Since this is new code, please take extra care in reviewing commits before pushing to help guard against bugs. Mark plans to commit the script under src/tools in the future. At this time, $FreeBSD$ tags should not be removed. This causes merge conflicts (has already caused them). New code that will never be MFC'd needn't have them. We've turned off enforcement that almost all files have them. However, since future stable/12 releases will be created from subversion, the tags must remain until EOL stable/12. We'll revisit this policy in the second half of 2021 after 13.0 and 12.3 are out to see how it's working out. But for now resist the urge to purge $FreeBSD$ tags from the src repo. In addition, large scale changes should be minimized for now. The dynamics of the git tool are different than the svn tool. There's a number of ways that other projects mitigate the hassles of large scale changes which the git team is looking into (anybody on git@ can help!). Until we can publish a set of recommendations (by the spring 2021), we'd ask that you defer sweeping changes that aren't strictly required. It's looking increasingly unlikely that got or gitup will be ready for 13.0 to be included in base. However, support for both as packages will likely be integrated into the tree since these tools are a bit different from GPL git(1). Please ensure that your Author Name is the same as your FreeBSD committer name. We've noticed a few instances where this wasn't the case so far. We want to make sure that anybody doing this is doing so intentionally and not accidentally. For the moment, a reminder email will be sent only when it's noticed. git log freebsd/main..main Please be mindful to use a single line summary for commits to make git log --oneline more useful. This should be followed by a blank line and then the rest of the commit message. Please take a moment to consider what's in this line and ask yourself if it's the most important information or not. If not, consider including it later in the commit message. MFCs should continue to be done as before (except using git cherry-pick, and maybe a rebase to squash), with one exception. Please consider adding (or reusing from the original commit) a single summary line that describes the MFC. We know it's on stable/12, so you don't need MFC in this line. We're writing up documentation on how to easily bring in pull requests from github, gitlab, etc. While straight forward, there's a number of fiddly details that you need to know and we're collecting all this info in one place. This will help land changes, but won't fix the project's long-standing 'somebody has to read the submissions' problem. We hope to also have some recommendations on that. Please see https://github.com/bsdimp/freebsd-git-docs for more details. Please note: I'm a couple days behind on pull requests. Warner From owner-freebsd-git@freebsd.org Thu Jan 7 10:03:56 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 918C74CA6AD for ; Thu, 7 Jan 2021 10:03:56 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4DBMJX3jqxz4p6f for ; Thu, 7 Jan 2021 10:03:56 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7DC1E4CAA92; Thu, 7 Jan 2021 10:03:56 +0000 (UTC) Delivered-To: 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 7D73F4CA7FC; Thu, 7 Jan 2021 10:03:56 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBMJX0Ffvz4p9L; Thu, 7 Jan 2021 10:03:55 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 107A3rat017761 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 7 Jan 2021 11:03:53 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Thu, 7 Jan 2021 11:03:53 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: freebsd-current@freebsd.org Cc: bapt@freebsd.org, git@freebsd.org Subject: Re: poudriere && moving from svn to git for downloading source Message-ID: Mail-Followup-To: freebsd-current@freebsd.org, bapt@freebsd.org, git@freebsd.org References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4DBMJX0Ffvz4p9L X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] 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: Thu, 07 Jan 2021 10:03:56 -0000 On Thu, 2021-01-07 at 09:27:59 +0100, Matthias Apitz wrote: > >Hello, > >I use poudriere to compile my used ports. Could someone please explain >or point me to a document which explains the now to be used syntax to >create (i.e. checkout) the jail and the ports tree. Actually I'm using >something like: > ># poudriere jail -c -j freebsd-r368166 -m svn+http -v head@r368166 > >or > ># poudriere jail -c -j freebsd-head -m svn+http > >and for the ports tree > ># poudriere ports -c -p ports-20201130 -m svn -U svn://svn.freebsd.org/ports/ > >Thanks > > matthias We've recently discussed in the Git WG what would be required to get a seemless migration going (as in, you switch src + ports to git and things will just work). Thanks for flagging the specific revision problem though, not sure yet what to do about that. Cheers Uli From owner-freebsd-git@freebsd.org Sat Jan 9 00:38:51 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 4F1D34DB4D7 for ; Sat, 9 Jan 2021 00:38:51 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-21.consmr.mail.gq1.yahoo.com (sonic305-21.consmr.mail.gq1.yahoo.com [98.137.64.84]) (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 4DCLgZ15Dtz3lcD for ; Sat, 9 Jan 2021 00:38:49 +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=1610152727; bh=9nZIeIJJIxhkThtIkW8nYMJ2w3ig8OR96ebZZcKXhL6=; h=From:Subject:Date:To:From:Subject; b=hsWKMvMdp3egvJhclEdLqC+UaLxA6ExBlSd6ccBgdsYDty0sR04SpyFoE8XFRF7oWWlD3RaiYwTsJfv/R06gsTiL1egR2AlMckc7KfTPXha1uaMSUlaoG651qUoeRtislPFT1Qjw4eIEYxFoinPDlICzAExfqY0M67j7lZk/Txtn9oYUaOmf7ri6i9hnEAjDsa0TUOK17kLWA0I2VnQXEYut9tIHTi5Gwwc9ExsU2s74PiDyz8oBEENKC+8Jvqrd0kp3UXJU4ih40YKZkVyjSDKBujcFQTORlB67r3G4xCgkEwyMPBNGVKO06GBxQDU2jKZs+T929CgwSa+1LG5KjA== X-YMail-OSG: Uy1WeOQVM1nUIZSTYw.p8PKtcBlUb9_fV7YNAolghaLOzyRDLNirP8k1Dv8fIMz GL0bLXmFD_j_hKYlKiuYdisoL_GeReURhTux1LVeuaPHALTER3ClkqE8lkXT6cik4mdyiTtN3AvX KlIaKc_oHVt5Mt3ls6N0bGw2t0Cp_Y1wYQ9setZfsrU3pvK8XN5I56ktMGcK81oJHU27LmrOWOLI 5B.ra4VuKO6yre5Su6LjQXPJIZTmLsVvZr8VvkVBGYZyF7Os_rXDXhKQ6OzKx16EiuXEMe1q22Ui TW2HSIuwsAAtqaI_u6rIyo97fsgVe7yd_AKzFRKElxqZq4SpeOUTtXdQzR4vMQQ0B0hoj9uapUvi ZpBDX6uSaz5NkVGHuRisn_rJoEWX5ejous8RycxWm3PCEM58aLi9RmRtPZY3ypxsXf5IDBozQyAU 6mGk2vntughHuufBWl1DALzhJ3Heje1bKfBclndBP0Y23rPpeNT1hWkIIxBywWd4mZIri9JviigZ Zkr_NSLWI8iYTVX2BYErIc314lBwQW4_nYMpx05TrzkylPUs8yv22i0zaLUdQVe1jtZZeoIHzbA_ 3A_OWc9NaryXEcM3Gvhed7CtlD5FubGQ1hilEgPmb1LZDV2rKJbcoBAHZQN6H6Y4HNjBM9JUcaYI A7zz.0GMubdvR.dMNBYELrwGoDg5wnKlakGWAJHIXx4CyQ4Q4zZrfgc6ShoZD.ItZpPTf4XIXzC2 _5thb..d2eB5hCsG_z_TdfG7nra5CXX8FEHnMDxLc_L.GTJRhxPsgZT7Ab74BvO8xK4yltro.QMw aAg7xToigvmCoJs6hv1mLMNwihOnMjefh5EAQeCasKgsmU9QWistKS.y6ozlb8y2C050FaDULO5d f1dWxZdO.YnI9qywFBjoERp.uMiXTA75qzZXCGqIZuoJ.IPKNg9dO0vO9Lk3_h1rpXi885vk6_0e k9jYJgrc3bU4nkQnMi9z0qACw0FRxjV56BxJLrUcUFxyATWb5hwrhUtBo_oK4Yt9oPYktnzfmmK5 e7PyRMqBjQ5hPa2VSiPV8U7d9TD8MCSn1UVAaw3FEV4YE2KPlvwLfEhM_3pLJuPzlM4lHr9gLecg trAtDh_hNx.q.zYxKZVuePl0OuVRxoID5KogL_ddF8CF7GK02XlMdcIZZwJIjnqkvWeFKVrRQnW1 cDvZ0cEQhDrvpojZqaR.UXqEE10xFTIFvdreABHLNRDlsvY3vjm16teyrTLQdTlPw8a6g6s5GLJM D1XzZWB2jvFz3fM_mHzB1Nz2bNDZ_lgqFC9n.5ARtmRH9CXQDEBzi2vhDgX6stXxtNsuIcOwTtuA 0guLrTIjObYGqQlN4ide5FYPwS3mnPi7jvkuA6iPPw12LIbKn3ngH580jCmN4CIJpvIWXj.ER1rJ _AK8OBTM1JKFPN0KdeciWUyPfG_TssLFoi0ktc8VSvyZ6TVOazon0tgwceD1foaHcjtnFSBPwVuH 3G_dOC9rt.x6.3tX7b0JpbxWuvzo.nHmV5aXEcTYg78T8_kULefiAT1eablgIHRaNB1I3ox.fc5F 0HLyhbn0SQetNdwPCCRi_sHb5.H7eYJquYiPvbA8f5U0d4gka9s8a2TRCRp6So4fyjePr2jybyrO F0l7ODadVxMBWgbR5i0ADDXboWVjFFrGfXXVZQErZqVmHO085_vpnr0_uxd1QbrS3kyJl2FwnDWB ZWRFrzXdQZDiKFPsBr8hn67utYYNPUSGq8EMkx1Zka1Kw54S5O3xayClI1uPgMG8Ss0zXQfw1biA f4Rrfml0sCul39Qx2tjY8LC6HhxnIynDsiGTqv3jSZTgcDMcaYXOn95J8Eg6.7FJeX74KVE_I5Uf OiH2Ze5obiAXXm0aRH_6q1MnXyfQHXZFZYj0qWxkZUt9LqXNHS59WPyStFXGBmvV2lVTzo72S73v zSTVQRny3qFdSdc8EcBbpUA17.5qswEPQt7jWWqhKs2cVQumt1T.H6CBP2gGdHFinwX0JqhLC9eE LVGPHz.hc70eSKC3l87Q0QwfAyWbwy2VpWSqm.7.SXwMXD_Ijt4ZddXu4CgV.PU5q70E.wb7sOy0 YtWwdPxrK2tX6J_ElolUqgdqF4tVe0zKuJUcoRjwVZO8_nBas9gq.U4b6ETruS4yvBerqDMhWjxY iF7zSHrtgX7xonD_2QXZoQtdZR_t6y90Dl6X11hwzZnBzQ.ua.QnQop6KVZwcQw45c5siN.2USNI y.ROzl.9PsURxh2kl7MEIrCzdGMxth.Z7Md659ySME5WUU5Vs7mdRHsIPymqfMLL7oqcPtD8UArY objpHqAqkFdG.awDvsNNcg_iFC35OcL4T1JNlEdaBJO2z0lBnh1bVZETETTvCqp665NDqgkAdVJa XAt3SI8jNa.dxCKc5llfJwo4MizElIzaPGaV04Dumz_QKkXETO04eruAGCLBMuMKoPnxQxIUmCYM A3Hs9rPxXt.qlBg-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Sat, 9 Jan 2021 00:38:47 +0000 Received: by smtp414.mail.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 7d0a3f13f65396ad1b05ce164dc07b91; Sat, 09 Jan 2021 00:38:46 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: For main, will ci.freebsd.org display under "Build description" text like: main-c255728-g99d1a7829f88 ? Message-Id: <9790978C-6D11-4729-9F4F-8ECD06C61D4A@yahoo.com> Date: Fri, 8 Jan 2021 16:38:43 -0800 To: freebsd-git@freebsd.org X-Mailer: Apple Mail (2.3654.40.0.2.32) References: <9790978C-6D11-4729-9F4F-8ECD06C61D4A.ref@yahoo.com> X-Rspamd-Queue-Id: 4DCLgZ15Dtz3lcD X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; 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.64.84:from]; 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]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[98.137.64.84:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.84:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.84: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, 09 Jan 2021 00:38:51 -0000 What sort of text will appear under "Build description" for htts://ci.frebsd.org once main finally starts getting CI builds again? Will it be like the uname output (invented example)?: main-c255728-g99d1a7829f88 If yes, that allows selecting the order of display for Build description to usually track the order of the commits (for main anyway). Absent such, is something else to be done to make it more more reasonable to identify such? (Add a main commit time that could be sorted on or some such?) Historically I've used ci.freebsd reports to avoid stepping into a range problematical for builds, picking a vintage that worked for each of: amd64, aarch64, powerpc64, armv7, powerpc (the FreeBSD contexts that I have access to). Doing this I've sorted the display by "Build description". ci.freebsd.org has also been handy to point at for asking about commits that break building for some of those contexts. (I'm not sure why main [no svn involved] has no builds/build-reporting yet on ci.freebsd.org. May be it is to deal with such issues or various things just are not ready yet, even without a conversion to svn being involved for those builds.) === Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Sat Jan 9 04:43:17 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 D82014C984A for ; Sat, 9 Jan 2021 04:43:17 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DCS5d5Wgqz4WJV for ; Sat, 9 Jan 2021 04:43:17 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f172.google.com (mail-yb1-f172.google.com [209.85.219.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id ABFEE8083 for ; Sat, 9 Jan 2021 04:43:17 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f172.google.com with SMTP id b64so11432790ybg.7 for ; Fri, 08 Jan 2021 20:43:17 -0800 (PST) X-Gm-Message-State: AOAM530HyK+y6j3WzNoEbGmwlsPAvPypT4SIlcgAcgZpOqLuQpe4aw6J C7/Oey/Sk1NkuE+R9SVL9MM9l604aPEJbc8GZu8= X-Google-Smtp-Source: ABdhPJzxrSk1fsNC/Orm2bGDsqVD1FINeXYjpjQlKwujxrro8l14hB4ecEoPG/tG/7LnLaiqhEaU1EU5mAvb9cE54QQ= X-Received: by 2002:a25:c107:: with SMTP id r7mr10152448ybf.492.1610167397187; Fri, 08 Jan 2021 20:43:17 -0800 (PST) MIME-Version: 1.0 References: <9790978C-6D11-4729-9F4F-8ECD06C61D4A.ref@yahoo.com> <9790978C-6D11-4729-9F4F-8ECD06C61D4A@yahoo.com> In-Reply-To: <9790978C-6D11-4729-9F4F-8ECD06C61D4A@yahoo.com> From: Li-Wen Hsu Date: Sat, 9 Jan 2021 12:43:06 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: For main, will ci.freebsd.org display under "Build description" text like: main-c255728-g99d1a7829f88 ? To: Mark Millard Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" 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, 09 Jan 2021 04:43:17 -0000 On Sat, Jan 9, 2021 at 8:38 AM Mark Millard via freebsd-git wrote: > > What sort of text will appear under "Build description" for > htts://ci.frebsd.org once main finally starts getting CI > builds again? > > Will it be like the uname output (invented example)?: > > main-c255728-g99d1a7829f88 In short, I'm not sure, but very likely. Currently there is a stranding issue that Jenkins doesn't provide an easy way to get abbreviated commit hash. This is not a blocking issue, and there are still waysto get it, but may need more time to test and implement. I haven't decided what is the best to put into the build description (and even haven't taught ci.freebsd.org about git. but should be soon!) I was thinking just using the abbreviated commit hash, but it might be a good idea to also prefix or suffix the commits count. I'll check if it is possible and easy to get this. I'm not sure it still needs to include the branch name in the build description, as it is already in the job name, and on artifact.freebsd.org, there are parent directories with branch names. Best, Li-Wen From owner-freebsd-git@freebsd.org Sat Jan 9 05:39:32 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 E8EA14CA60D for ; Sat, 9 Jan 2021 05:39:32 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-19.consmr.mail.gq1.yahoo.com (sonic306-19.consmr.mail.gq1.yahoo.com [98.137.68.82]) (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 4DCTLX4NrWz4Y7H for ; Sat, 9 Jan 2021 05:39:32 +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=1610170769; bh=w/GC41dP1yKWlvMEGeLpxVh4Ty/zyM536YlhSCYECmp=; h=Subject:From:Date:To:From:Subject; b=U711ffBaZpS+Pr+tE9KVlBUMcvEhqyuoXPg3xXbz07uwCLknIEDc5tzmuPYSWZVIhychxsgnUaMt8Wh86Helaj7fNqU6uPG3K+a2kQB6ulWzsS59eQaLqCSkVguiIRkOctPO0Acm67O403dJA2V6xlHn8/9o2mUpY4Q4xpXIyalaI8Raw4po7gzk4RBtM9E909SZpQnD2M0nmA/24aLZYc9JScYOdTa5N9W4onc54vuzOaNnvVGjqU8SSYVZeRsM/pnjF/3e4dyJL0YXGkTbZNslCFAV4Y+WS9b6t7xr/HffmIeFew48NSlT2nkXEMGnMKgsSbdHtD0kisP+RTbdgg== X-YMail-OSG: WQ2G4vAVM1myb4Gsp.M04nNQBIKuneAyENw3YDmTstG5nSMkk7OwOtDRqOIvVDj gZsLZs_foFY9EHWJfsK0DNuQq5knhSgdH3hfX8IhZX6ZQwmq7MMsLtWD4lEYBobbnvWsQimLnuMd MlFN..g4PehZ7.Qp4hwTTWmvLfJff2APOiZ3dvrs_z0fqfI43C8rn4auTRTkxPFgm2_MGF5HYaKu 5.O9mGOjlZytbCxxN7Qi7aZ4EPqvlm9x4DH9xK6RAMT2LJkRmeUU8yoROQf4ZDOVR6KgOR4BKQx6 MZTtYR6dxWFj2dxn3PuFMEP5IgD6qkN7BF8daF9IVs1k985N0vk29E.ofuRfQJs319ztfYISmWqx Twc41.7JZ759d6O89BBiQp6dubhFetoLTFhOzkOuTswrfwEsDjT62EO5C2MJv2tZdcteBZMpLFLq 20RXkK5.5WM3Qy4.jzj7obsIBhE6dWziRRDsRIc_BKDRIc1awRjMCzFosVPWsFIWAz.nI33f37ps wAIZMlUVuK1EZqc.eDPeHB1sSzADxmLsyPFQdxGNw3uTC8UIjHhotOYTVrvihMuWUQDUZ7pLe4Ws Tn4aTUvWTirBMpTuOzfDqD5wXHWbLUyQy.QDOxHncQSe2_pW957ryIQMJaBApHJxjCsDk5sjaH52 WRleK0FzlS19HLBPIwCqHCA8kQFnCFFfqtDWjoMob3SYhlLmMixeZYTZTtW0BgxEQcY9NluE3FSX pxgjuqAd3XuQNyWMTeU2IHWoaKfJuOAzeRv6uLUNvgcOyUoekVjID8Fu4E1DkxERvKT6EwLvA0Zx b3ZbW5luOJS6ILDo8pcOx.ed0XLW4tERvcJa5Oi.8HJpJltupSrzZrBxr6T_qYDqSSTmq9gA4Sw. 6H5VJlW.w2yUvA8fcU3eGrfcFaWT9DeakQEET4GiZOu_75Oxc0HZVJgfBFCQ52U4I4ovPI6OqFpk 23qa16tAS7un2xWlgO8FgSkBufsYuIldYeN5PCf_OTI_9cetxO8ZReYJfq8ticTB7abm6VAEkR3x mmr3VoU89Sy4TbtHZpXfaN.vZPCfbFsnFU5zDEIdLbAqgsKLOIcasD6xVCwna9ncIAEmcBjF.4u9 MfOyFh7d4x37kCb4RvdSsZcP7z__Zg7hu.mPCePiQ83PxNECS4LKcAuzS_ATzQJBixiRVaDTeyCV psYSPambz0500N3kba.rXyqdltfste2RdlDJxvfDxvJLrfv5q.dvWvlAGaDhMCNK4CJJnXmULlgz W.WmN4CT2fyxjv3Wfe19qvvk.6wokp8JFK_j04jRulO849AwnQN8Z2oao3EqFMYT1zKdAsNnZvwn wC2.WmBmWZ6MeqtuhoaZIF1NjFnmI0nfLi8tSPCS3BFyNmqfoydRKfXm67LtW36.kc_pGckc71.3 UePNPisvo9iRv.rZIK8gxrIO6cv7BnzvaQG__dCXa7nbm9pjb3SNAwlYTk4tEfINAHg9oWebGEeu mh0duooTryVZO0tH_rWMQsrq2WCo8dgQGtOxi0yWcoqTL4xwaqsFO0oFovl2QyFXHkIkYYxUq1NN fHUgqsx7V9NN0X0.GWDMC9Jna0NbNnVQsvk8mAyNgMmRkCc5.daR4u0al8bMCihCOgeMZDl4buKT WKOJ4wf57NjfDR4YR4uD9nMeBnaYdFNOBWx6uxETCXRn9ssoEcs_UZY2C.e6yGZ6xpFi2mNUyeva VPqUBU.UPR9ivNo.8fyLohzLJtcCHna6wYvUf49_gbz_xjo8L.6_bJ_LOkJCab0kd0GIg4ibRgQO tRCoo4VpJTNVI0MDNI3vXDWvlBA4D01zzj6._rVkVPBo6WV88tW6qwcDwCvayWmwP5SjZ3K9K4EB k.UGmiS181ZZoIMuHT0nj1VNHx.IARAF_SIC0BL4fzDyFYfWhvYjQsQGLTsVuUIXch_XalTW8oOV 2g5xsX44SQXA9NyYOw5oTB6gwHP1G4u5iesq0wl9O8Q8.kY0WPu6sdDkCW4.q.s8eOGXPnXZnfLS rcF61SQptJ6IfBmHOaTdlbeBz2G8CNr3R9FSaqzv7fYISg5qaQW9HhZW6DdioN9BHqJIrsVGOL0I 4Q3meNq1P.lUzRWFG.2A7n0AVxHpSMHQRqx8vm_iR5QwwF8G9.6kA55t7T8BOn04O3oWq6MXT_qw 95eOVPjyqj_bQBrqdwZI7ajv4urrRJE6meXEJkk7wxf3r9xj_Oytk1qQjSzqxhUBh.9pmagclB6u ryF_fZx6rUWuZRoMp0f965GgRoH3X7OIpb6Q9NosD46oMMe3Pumrnu9_BR.xk_DXzgB4K0nUWEZJ dnp5h47PG5ndiU07.In2isjy3G65.oHijbYsdNoxhqObDnAaXZPBBWkLV3KfJ.RmDfJZfEVWwHwt NKySgcFrXgCYeclliWKZcMKctnuaIvznTc_dOHBkv1lqn5NVQLIWy8Gdw9ZaKMMqHIqejw_JuBwx Efm3r0ybKusYFIr5GaG59t7GOnppYtLcJiKK7iY5y9pOQgvzDb.TczV5iS563wict1eJvIfMDyFx gVdjNKEx5g5qk995XqflXblMgR9US_6F0SVp2O.pqQh6qp67.vAYAOp27XXJDSj2xKy6P9.K5VCq iHcW4R5JH0Fb33Q-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Sat, 9 Jan 2021 05:39:29 +0000 Received: by smtp407.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 158c90f2e3bee5be93a306d388eebcd4; Sat, 09 Jan 2021 05:39:27 +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: For main, will ci.freebsd.org display under "Build description" text like: main-c255728-g99d1a7829f88 ? From: Mark Millard In-Reply-To: Date: Fri, 8 Jan 2021 21:39:25 -0800 Cc: freebsd-git Content-Transfer-Encoding: 7bit Message-Id: <449876C6-FF3A-46D5-B656-F8370FE64F6F@yahoo.com> References: <9790978C-6D11-4729-9F4F-8ECD06C61D4A.ref@yahoo.com> <9790978C-6D11-4729-9F4F-8ECD06C61D4A@yahoo.com> To: Li-Wen Hsu X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DCTLX4NrWz4Y7H X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 09 Jan 2021 05:39:33 -0000 On 2021-Jan-8, at 20:43, Li-Wen Hsu wrote: > On Sat, Jan 9, 2021 at 8:38 AM Mark Millard via freebsd-git > wrote: >> >> What sort of text will appear under "Build description" for >> htts://ci.frebsd.org once main finally starts getting CI >> builds again? >> >> Will it be like the uname output (invented example)?: >> >> main-c255728-g99d1a7829f88 > > In short, I'm not sure, but very likely. Currently there is a > stranding issue that Jenkins doesn't provide an easy way to get > abbreviated commit hash. This is not a blocking issue, and there are > still waysto get it, but may need more time to test and implement. > > I haven't decided what is the best to put into the build description > (and even haven't taught ci.freebsd.org about git. but should be > soon!) > I was thinking just using the abbreviated commit hash, but it might be > a good idea to also prefix or suffix the commits count. I'll check if > it is possible and easy to get this. I'm not sure it still needs to > include the branch name in the build description, as it is already in > the job name, and on artifact.freebsd.org, there are parent > directories with branch names. Cool. The below is "just me", not some sort of grand claim about general use. Just something to consider. I can think of one reason to have the Branch name in the "Build description" on the https://ci.freebsd.org/ page: there is no way to sort the display using multiple fields to subsort in a specific order. Someday there will be both main and stable-13 that are both git-only. I'd prefer to be able to look at an order that keeps the two in separate groups, each sub-sorted by the c?????? figures, even if the c?????? part happened to be the same at some point on the separate branches. As near as I can tell having descriptions something like [invented examples, illustrative context notes added in ()'s]: main-c255727-gc98a764c681f (say powerpc64) main-c255727-gc98a764c681f (say amd64) main-c255728-g187e9abe180d (say amd64) main-c255728-g187e9abe180d (say powerpc64) main-c255740-g085d41abe5f1 (say amd64) main-c255740-g085d41abe5f1 (say powerpc64) main-c255760-g79302a6304b1 (say amd64) main-c255760-g79302a6304b1 (say powerpc64) stable-13-c255728-g42022ab2ee2f (say powerpc64) stable-13-c255728-g42022ab2ee2f (say amd64) stable-13-c255759-g085d41abe5f1 (say amd64) stable-13-c255759-g085d41abe5f1 (say powerpc64) would mean that sorting on "Build description" in the web page would do that. Having the following would not (variant of invented examples above): c255727-gc98a764c681f (so: main) (I'll not show amd64 vs. powerpc64 here) c255727-gc98a764c681f (so: main) c255728-g187e9abe180d (so: main) c255728-g187e9abe180d (so: main) c255728-g42022ab2ee2f (so: stable-13) c255728-g42022ab2ee2f (so: stable-13) c255740-g085d41abe5f1 (so: main) c255740-g085d41abe5f1 (so: main) c255759-g085d41abe5f1 (so: stable-13) c255759-g085d41abe5f1 (so: stable-13) c255760-g79302a6304b1 (so: main) c255760-g79302a6304b1 (so: main) Eventually 3 would be interlaced: stable-13, stable-14, and main. Note that the c?????? being the same is not the major point or case, just a limiting condition of what I view as my needing more manual scanning/filtering effort when reviewing the list for my purposes. It is just not an order that I find easy to use for much. Sorting based on "Name" would not keep the c?????? figures grouped at all. "S", "W", "Last Success", "Last Failure", and "Last Duration" on the https://ci.freebsd.org/ page just do not fit the specific type of grouping at all. (They are useful for other activities.) https://ci.freebsd.org/tinderbox/ does not sort/group by c?????? in a branch. So I historically found it harder to use for the specific purpose, compared to https://ci.freebsd.org/ sorted in Build description order. === Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Sat Jan 9 17:52:51 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 7CD394DDC71 for ; Sat, 9 Jan 2021 17:52:51 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DCncg37twz3nvf for ; Sat, 9 Jan 2021 17:52:51 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 5ECBBDDC6 for ; Sat, 9 Jan 2021 17:52:51 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f170.google.com with SMTP id g24so8710380qtq.12 for ; Sat, 09 Jan 2021 09:52:51 -0800 (PST) X-Gm-Message-State: AOAM531FI6SXjipWpwv1Wf5Fwwu3YuzplCOcpXXVbQ+jY6lWjS/48fgn om2l76dqPlJ+xDuoGPilxR2Yyvl910+dQ2mjpNg= X-Google-Smtp-Source: ABdhPJy1DhPj7Mu7t9bKuZDANNyJslTYzK2Uw/MxaJsTb81GHwW5AqYTgau6G5f2gAPZJlT+ff8phJOFKWKEQ2oFUnI= X-Received: by 2002:a05:622a:195:: with SMTP id s21mr8701229qtw.53.1610214770813; Sat, 09 Jan 2021 09:52:50 -0800 (PST) MIME-Version: 1.0 From: Kyle Evans Date: Sat, 9 Jan 2021 11:52:34 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Patch Attribution To: freebsd-git Content-Type: text/plain; charset="UTF-8" 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, 09 Jan 2021 17:52:51 -0000 Hello! I haven't (that I recall) seen any particular guidance one way or the other, but what's the general feeling on "Submitted by" for patches that come in via Bugzilla without commit metadata vs. committing locally with --author="Name "? I did this with d36b5db and didn't receive any complaints, but I'm curious if we should be more actively promoting setting the author correctly whether the patch came in with it or not. I noted that Warner's meta doc[0] lists "Submitted-by" which is where my uncertainty comes from. Thanks, Kyle Evans [0] https://github.com/bsdimp/freebsd-git-docs/blob/main/meta.md From owner-freebsd-git@freebsd.org Sat Jan 9 17:54:41 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 27FEE4DE052 for ; Sat, 9 Jan 2021 17:54:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DCnfn0WwJz3nmX for ; Sat, 9 Jan 2021 17:54:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x735.google.com with SMTP id z11so11364935qkj.7 for ; Sat, 09 Jan 2021 09:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7TfEu2zprZCGTRlQfLr05+AqolOj6JjS0wspg+Wj89Q=; b=RqmMtnF6bEmveIOCKyl16KjPX/QK4UDxoX/bwuXLq9bwEEVQspECJMdO8G62wh3erL T9mUuv7kdQycoeh8DOA1TlbRrKwprqGByTQstJWlwzIzuGTvpMwXUmwhwtKkCXYaHcIY pUA2fKXvtLJHQdrTue4wG7Sye48Q3oN7maQrxgfiasJ6CzCMmBx4y/q9gC5z10CUViXy xb1KDbG1Y/FizevuruTfyjjpRBCJ2xlr5KjEMCWeNwz2HbevX8IOv/tGOuCsJYrk2XoS WVRcOHZFSTHG9Ti/QoVgEQIi9a0PxWhloAeXCjQimIhSsZ1NH8V29UrXHgY1HlLOnbE7 UGhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7TfEu2zprZCGTRlQfLr05+AqolOj6JjS0wspg+Wj89Q=; b=fPYyygBm1bFWiqF1ytKWGDzgbHHd7sIAZp9WCTW3qOZM2xjZjfvvpqc/Y0S7/uQZll dpsgwB+1Pwb6I/aKFUaKQP1QzSaG2Y+kbKVAfOUijdFY6AxQtOom0Q6rGv7GppzJs5ch 5pDyt/SNmAqTOUDZHIaqUauoFx5LUqaEtEQj6n5SiDtK71JPDW15uevYGxDgxx7F/kgy vLb3uLu8Cg85RHFeBm1P5NHDE0FBjQXtRiHM9MBbTj6uh6hAa/Dxwf7oxYA6MlgAIKc9 1BdMv3a29fF3pmnDsUtKLYogCJ/B5UNc7X6SvTHXCGn2uGoagT1GKUqHk5GqDiSlGR9D DFLQ== X-Gm-Message-State: AOAM532sF/jj1nMNr5yMx3888xKHg1OnVxSIWdi2E4YUX6dqofsEW1aw G/xO561WXhgSf1Ga3jFxelsFaibvVkBAklmFJM9k9g== X-Google-Smtp-Source: ABdhPJyXiuompcgzq/5fVQi/d8RegrfYk33kX19WQZOiw9TkAtfSRUDEMKPehRF59U+S6L/sk1Ykp4yr+XHpwlZ7fH0= X-Received: by 2002:a37:a614:: with SMTP id p20mr9277493qke.359.1610214879943; Sat, 09 Jan 2021 09:54:39 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sat, 9 Jan 2021 10:54:29 -0700 Message-ID: Subject: Re: Patch Attribution To: Kyle Evans Cc: freebsd-git X-Rspamd-Queue-Id: 4DCnfn0WwJz3nmX X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 09 Jan 2021 17:54:41 -0000 On Sat, Jan 9, 2021 at 10:52 AM Kyle Evans wrote: > Hello! > > I haven't (that I recall) seen any particular guidance one way or the > other, but what's the general feeling on "Submitted by" for patches > that come in via Bugzilla without commit metadata vs. committing > locally with --author="Name "? > > I did this with d36b5db and didn't receive any complaints, but I'm > curious if we should be more actively promoting setting the author > correctly whether the patch came in with it or not. I noted that > Warner's meta doc[0] lists "Submitted-by" which is where my > uncertainty comes from. > My document should be updated. I think what you did is fine, and we should document it as best practice. Warner From owner-freebsd-git@freebsd.org Sat Jan 9 17:56:41 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 B4E754DE1FD for ; Sat, 9 Jan 2021 17:56:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DCnj43dsDz3nbg for ; Sat, 9 Jan 2021 17:56:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72d.google.com with SMTP id 143so11321918qke.10 for ; Sat, 09 Jan 2021 09:56:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wjPhmM4AtcKVfe+fNjaXUb+3oNsxa2TZUivjB7OjAug=; b=L3e1hRCvJidorD1vI1xC6OJDCdbO/SwwBFG/LMq6TzwmFzm8Y6TdzaTLFfcSmHdNh+ ZImHImmT/p/D5M0TY8id2jREaD9jLqr2I7LKRQbjScady+k2gVlfna7tUmfvmH4nTDsZ RLSufOgZvt9IQeZ1khsbfF0RXuZIyGzo5aaKjL13XWbgX/OnKpsJ5jkuwN4phvwe2Ona HGYJM73WcXHehKvhLvdK3RifZC5JgYqh4pS3DQQUqFxaShF5s7rs8v7U9IsNnynUK/WJ Y34dSRUac+Bx0rm0l8dvhHymg4Ad8Dh2S2LjLmZ7clhS/YN0nYGy80zHTpUUgKIYdgKP OLag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wjPhmM4AtcKVfe+fNjaXUb+3oNsxa2TZUivjB7OjAug=; b=qMm5iqIbwLRhqqKvGiqyCqD5/KwjF1AUAQLOQMFHvOT0abiG85dJ7ZpNhIqzQq+6GD SFus+h8Q+lJxUJ+x/XDJoRzrik/xaRNHpI9QRmCVnT97cq/qb2mdVpCEQoiNqgKg58tU NuHTINBFE52BovEkkYxNiTTBzbDr3oLM+zFDPHxH1RKEb/XEhvkCzdtQK86mQFzbuwvd I9mazTaDt4/wwtdY98rKTZxY16BpHGgD+Drwc+Z3Vgc/Ew9hqYzs/w8+g7AKzLl8vH1e hv5/Ue/4koFmbz5vMqjL3Ki1aQ6y7t40J0KmhEPZtDIj3lD3gPpdAuwiX6J1yQnNtFFp vTxQ== X-Gm-Message-State: AOAM5300D8V5Ti6Yl2AOhe9YQ0EZJvU26P6MEgZsAXFjB1hagrzbIMcQ Bc2jKogLKRbgMiUPReXPjVJBNmsf1yQ9zSqzwPUyOg== X-Google-Smtp-Source: ABdhPJz3nV93/uXhgqxxh/Z0KC6q/ZhKHVXtkH2VMiOHUw84To46GHXQSGD4/OXmh6Ts2rspXX7MJJT7I1FFHlc32SI= X-Received: by 2002:a37:8505:: with SMTP id h5mr9326064qkd.44.1610214999643; Sat, 09 Jan 2021 09:56:39 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sat, 9 Jan 2021 10:56:28 -0700 Message-ID: Subject: Re: Patch Attribution To: Kyle Evans Cc: freebsd-git X-Rspamd-Queue-Id: 4DCnj43dsDz3nbg X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=L3e1hRCv; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72d) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; NEURAL_HAM_LONG(-1.00)[-0.998]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72d:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72d:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72d:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 09 Jan 2021 17:56:41 -0000 On Sat, Jan 9, 2021 at 10:54 AM Warner Losh wrote: > > > On Sat, Jan 9, 2021 at 10:52 AM Kyle Evans wrote: > >> Hello! >> >> I haven't (that I recall) seen any particular guidance one way or the >> other, but what's the general feeling on "Submitted by" for patches >> that come in via Bugzilla without commit metadata vs. committing >> locally with --author="Name "? >> >> I did this with d36b5db and didn't receive any complaints, but I'm >> curious if we should be more actively promoting setting the author >> correctly whether the patch came in with it or not. I noted that >> Warner's meta doc[0] lists "Submitted-by" which is where my >> uncertainty comes from. >> > > My document should be updated. I think what you did is fine, and we should > document it as best practice. > If you write something, I'll land it :). We should also consider what to do for code we pull in from NetBSD, etc.