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