]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: extract handling of priv member into reusable function
authorElijah Newren <newren@gmail.com>
Wed, 19 Jun 2024 03:00:13 +0000 (03:00 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2024 17:35:24 +0000 (10:35 -0700)
commite79bdb426c7033cf431cd5cb628196fd19303da0
tree90e92e38f574cb23eeae7ca6c396bad62bda377a
parentd63586cb314731c851f28e14fc8012988467e2da
merge-ort: extract handling of priv member into reusable function

In preparation for a subsequent commit which will ensure we do not
forget to maintain our invariants for the priv member in error
codepaths, extract the necessary functionality out into a separate
function.  This change is cosmetic at this point, and introduces no
changes beyond an extra assertion sanity check.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c