Add a test that reproduces a timeout issue in gix-merge.#2482
Draft
Sebastian Thiel (Byron) wants to merge 1 commit intomainfrom
Draft
Add a test that reproduces a timeout issue in gix-merge.#2482Sebastian Thiel (Byron) wants to merge 1 commit intomainfrom
gix-merge.#2482Sebastian Thiel (Byron) wants to merge 1 commit intomainfrom
Conversation
The problem was detected by Google OSS-Fuzz, and occurs because of window-size problem in imara-diff's preprocessing. `imara-diff` is the place that can address the issue.
Sebastian Thiel (Byron)
force-pushed
the
fuzz-merge-fix
branch
from
9ecdb74 to
39feb8c
Compare
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
1 participant
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.
The problem was detected by Google OSS-Fuzz, and occurs because
of window-size problem in imara-diff's preprocessing.
imara-diffis the place that can address the issue.Tasks
imara-difffixesimara-diffv0.1 and v0.2 respectively