opnsense-src/tools/tools/git
Ed Maste d51c590023 mfc-candidates: fix output order with incorrect commit dates
Previously we obtained the list of MFC candidate hashes (i.e., those
commits only in the mfc-from branch), removed the already-merged
commits based on "cherry picked from" commit message entries, and then
printed the list sorted by commit time.  This is usually the correct
order, but it is not when commits have non-monotonically-increasing
commit times.  This is unfortunately the case for a number of commits in
our tree.  This made it difficult to merge some groups of dependent
commits in the correct order.

Instead, leave the from-list in git rev-parse order, and move the
matching logic to a new lua script.

Reviewed by:	imp
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D44808
2024-04-16 14:20:40 -04:00
..
hooks prepare-commit-msg: add 'Event' 2023-05-22 16:01:09 +02:00
arcgit Remove $FreeBSD$: one-line sh pattern 2023-08-16 11:55:03 -06:00
candidatematch.lua mfc-candidates: fix output order with incorrect commit dates 2024-04-16 14:20:40 -04:00
git-arc.1 git-arc: Add -c flag to patch to commit the change 2024-01-14 19:23:46 -07:00
git-arc.sh tools/git: ensure git-arc is more platform indepdendent 2024-03-27 09:57:01 -04:00
HOWTO Remove $FreeBSD$: one-line sh pattern 2023-08-16 11:55:03 -06:00
Makefile git-arc(1): Add manual page 2021-02-12 23:35:02 +01:00
mfc-candidates.sh mfc-candidates: fix output order with incorrect commit dates 2024-04-16 14:20:40 -04:00