Repository navigation
diff: only report a recursive directory loop when both sides loop - #379
Merged
Merged
Conversation
One list of ancestors was shared by both sides, so -r stopped with 'recursive directory loop' as soon as either directory was a link back to a parent. Check each side against its own ancestors, and give up only when both loop or the other side is missing: a real directory on the other side ends the recursion.
sylvestre
reviewed
Nov 11, 2026
| }) | ||
| }; | ||
| if let (true, true, Some(side)) = ( | ||
| loops(0), |
Collaborator
There was a problem hiding this comment.
matching on a tuple of bools is a bit clever
could be if loops(0) && loops(1) and then find the side inside, no?
Contributor
Author
There was a problem hiding this comment.
Agreed, changed in f4fc09f: if loops(0) && loops(1), then the side to name is looked up inside. The GNU testsuite gives the same 19 pass / 10 fail / 4 skip as on the base commit.
Collaborator
|
Thanks for your PR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #363.
diff -rkept one list of ancestors for both sides and gave up as soon as either directory was in it. GNU checks each side against its own ancestors and only reports a loop when both sides loop, or one loops and the other is missing (-N). If the other side is a real directory, its finite tree ends the recursion.The ancestors are now stored per pair. I compared a few layouts with GNU diff 3.12 (one side looping, both,
-Nwith a missing side, links to the other side's top, loops of different depth); output and exit status match.