merge: set default rename threshold #4061
Merged
Conversation
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
When `GIT_MERGE_FIND_RENAMES` is set, provide a default for `rename_threshold` when it is unset.
|
Did you man to change the library's default to be finding renames? That would certainly need an entry in CHANGELOG and it doesn't sound like what the commit message is saying. |
|
Yeah, that seems reasonable. This is bringing the defaults in line when you actually set up a structure using |
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.
When
GIT_MERGE_FIND_RENAMESis set, provide a default forrename_thresholdwhen it is unset.The merge machinery expects
rename_thresholdto be nonzero ifGIT_MERGE_FIND_RENAMESis set. Previously, a consumer could setGIT_MERGE_FIND_RENAMESbut leaverename_thresholdunset and merge would get terribly confused.Fixes #4035