Date: Mon, 4 Jan 2021 00:39:05 -0800 From: Ryan Libby <rlibby@freebsd.org> To: Mark Millard <marklmi@yahoo.com> Cc: freebsd-git@freebsd.org Subject: Re: Reporting context with list submittals for defects when local git branches are involved: needs a new description? Message-ID: <CAHgpiFzjKRAkECccUgMWzOoq=syRC9j0hwHR4U6WvJMEf0p%2B_g@mail.gmail.com> In-Reply-To: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com> References: <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D.ref@yahoo.com> <89B5ACB3-C05C-40EB-AF0B-5E049928DD6D@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Jan 3, 2021 at 7:23 PM Mark Millard via freebsd-git
<freebsd-git@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHgpiFzjKRAkECccUgMWzOoq=syRC9j0hwHR4U6WvJMEf0p%2B_g>