diff3: Use logical operations for booleans, not bitwise
ClosedPublic
Actions

Authored by emaste on Nov 18 2025, 5:08 PM.

Details

Reviewers

fuz
delphij

Commits

rG98d08b86b4e5: diff3: Use logical-not, not bitwise for booleans
rG56bdfd2d967a: diff3: Use logical-not, not bitwise for booleans
rGabcb80f46c26: diff3: Use logical-not, not bitwise for booleans

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

Hmm, should also be && I guess.

incompat is actually an int that's incremented, so is not necessarily 0/1. explicitly compare != 0
leave bitwise & in place as that's what's still in the upstream GNU diff3

fuz added inline comments.Nov 18 2025, 5:53 PM

contrib/diff/src/diff3.c
304	This changes the semantics if `incompat` is neither 0 nor 1. Could have been a bug before, but could also be intentional.

contrib/diff/src/diff3.c
304	It was a bug; as the comment suggests any of the options `AeExX3` without `m` should imply edscript. `incompat` is incremented for each of these options. Upstream has this fixed in a different way.