Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX

Florian Smeets <flo@FreeBSD.org> writes:

> On 28.04.24 15:20, Emanuel Haupt wrote:
>
>> Nuno Teixeira <eduardo@freebsd.org> wrote:
>>> Ok, I understand it as I misunderstood 2024Q2 was including manprefix
>>> update.
>>>
>>> But taking your commit as an example, since manprefix fix was removed
>>> from all your ports what happens if you need a cherry-pick to
>>> quarterly in the future?
>> As I said, I'd manually copy the files from main, make the necessary
>> modifications (i.e., specify GNU_CONFIGURE_MANPREFIX), and then perform
>> a git commit/push with sufficient references explaining why.
>> 
>
> Yes, you would need to do a direct commit, and explain why it's
> necessary. It should be handled the same as in src, so no approval is
> required or anything. Just exercise caution and have a rationale.
>
> See cbaccc953d55 and 7555ec6eeba0 for examples.

Would be nice to standardize direct commit annotation. For example,
during Subversion days I've appended "(direct commit)" to summary line
and during Git days mimicked "git cherry-pick -x" footer.

$ for b in $(git branch --remote -l origin/\*Q\*); do
    PAGER=cat git log --oneline --committer=jbeich --grep="direct commit" $b;
  done | wc -l
23