On Thu, 22 Feb 2024 at 13:50, Mark Cave-Ayland
<mark.cave-ayl...@ilande.co.uk> wrote:
>
> On 22/02/2024 13:37, Peter Maydell wrote:
>
> > On Thu, 22 Feb 2024 at 13:34, Mark Cave-Ayland
> > <mark.cave-ayl...@ilande.co.uk> wrote:
> >
> >> This is also:
> >> Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2164
> >
> > "Resolves:" for gitlab bug URLs; "Fixes:" is for git commits.
>
> I think GitLab will happily accept either form (see
> https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
> which appears to be supported by the git history? But I can certainly make a 
> note of
> this convention for the future.

Yes, gitlab's regex for detecting this is quite wide; the
intention is to try to keep the semantic uses "note which
git commit this change is correcting" and "note the bug
which this change is resolving" distinct.

-- PMM

Reply via email to