From: Ezekiel Newren via GitGitGadget Date: Wed, 25 Mar 2026 21:11:04 GMT Subject: [PATCH v2 4/5] xdiff/xdl_cleanup_records: simplify INVESTIGATE handling for clarity Message-ID: <6abd052c347025610d26197ba5de8cd11fc1b618.1774473065.git.gitgitgadget@gmail.com> In-Reply-To: From: Ezekiel Newren Make it clear that INVESTIGATE is turned into KEEP or DISCARD based on the result of xdl_clean_mmatch() which reduces actionX[i] into a boolean value. Signed-off-by: Ezekiel Newren --- xdiff/xprepare.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 127848b764..dd595cf8a1 100644 --- a/xdiff/xprepare.c +++ b/xdiff/xprepare.c @@ -330,24 +330,38 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd */ xdf1->nreff = 0; for (i = xdf1->dstart; i <= xdf1->dend; i++) { - if (action1[i] == KEEP || - (action1[i] == INVESTIGATE && !xdl_clean_mmatch(action1, i, xdf1->dstart, xdf1->dend))) { + if (action1[i] == INVESTIGATE) { + if (!xdl_clean_mmatch(action1, i, xdf1->dstart, xdf1->dend)) + action1[i] = KEEP; + else + action1[i] = DISCARD; + } + + if (action1[i] == KEEP) { xdf1->reference_index[xdf1->nreff++] = i; - /* changed[i] remains false, i.e. keep */ - } else + /* changed[i] remains false */ + } else if (action1[i] == DISCARD) xdf1->changed[i] = true; - /* i.e. discard */ + else + BUG("Illegal state for action1[i]"); } xdf2->nreff = 0; for (i = xdf2->dstart; i <= xdf2->dend; i++) { - if (action2[i] == KEEP || - (action2[i] == INVESTIGATE && !xdl_clean_mmatch(action2, i, xdf2->dstart, xdf2->dend))) { + if (action2[i] == INVESTIGATE) { + if (!xdl_clean_mmatch(action2, i, xdf2->dstart, xdf2->dend)) + action2[i] = KEEP; + else + action2[i] = DISCARD; + } + + if (action2[i] == KEEP) { xdf2->reference_index[xdf2->nreff++] = i; - /* changed[i] remains false, i.e. keep */ - } else + /* changed[i] remains false */ + } else if (action2[i] == DISCARD) xdf2->changed[i] = true; - /* i.e. discard */ + else + BUG("Illegal state for action2[i]"); } cleanup: -- gitgitgadget