Date: Fri, 27 Mar 2020 13:00:23 -0400 From: Ed Maste <emaste@freebsd.org> To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uspoerlein@gmail.com> Cc: Warner Losh <imp@bsdimp.com>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CAPyFy2DR3ijP4A9RCS8YOkRC7PJppsddO_6BJ5oQDgb5EH4v3Q@mail.gmail.com> In-Reply-To: <CAPyFy2AKNJEd8=d7C%2BNa3qRcLiWXgpyj-xd9o5qL4ZZLFmKfFg@mail.gmail.com> References: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com> <CAPyFy2Dm12BD4yuGo65T_tQrGXapZxvSSurO=Gwn=2S1drq6ig@mail.gmail.com> <CAJ9axoRs9zWXteeDmZ8L1nucBPqqB-WMGuXTRFyVuxo2h4F11w@mail.gmail.com> <CAPyFy2BgeP=WxeZeYVS3z%2BgzArJe1h9ofO42O7HvznpLBsBKbg@mail.gmail.com> <CANCZdfo8m4Kg%2BXTbUJYwi1gxOr8C9RobBR0DcZ6D6veiKkOB2Q@mail.gmail.com> <CAPyFy2DROg_v47QrxmK-1TuFzqTqf=2e63N7qoX1_V=GyDkyRg@mail.gmail.com> <CAJ9axoTb2nZeMK3xYvavSm%2B=6=WQpKuUq_TWkD-S95nY9zbkCQ@mail.gmail.com> <CAPyFy2AKNJEd8=d7C%2BNa3qRcLiWXgpyj-xd9o5qL4ZZLFmKfFg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 26 Mar 2020 at 19:37, Ed Maste <emaste@freebsd.org> wrote:
>
> I will, but I'll have to run the conversion again saving the output so
> that I can figure out what branch name(s) are involved.
Ok, it's not clear to me what is responsible for avoiding merge
metadata for these commits.
In the hack you referenced:
> if (path_from != NULL && prevrepository == repository && prevbranch != branch
> && (branch.startsWith("master") || branch.startsWith("head") ||
> branch.startsWith("projects") || branch.startsWith("user"))
> && !prevbranch.startsWith("stable")) {
AFAICT the only condition on the "from" branch is that it's not a
merge from stable.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2DR3ijP4A9RCS8YOkRC7PJppsddO_6BJ5oQDgb5EH4v3Q>