Repository navigation
merge: set default rename threshold - #4061
Merged
carlosmn merged 2 commits intoJan 14, 2017
Merged
carlosmn merged 2 commits into
carlosmn merged 2 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
When `GIT_MERGE_FIND_RENAMES` is set, provide a default for `rename_threshold` when it is unset.
Copy link
Copy Markdown
Member
|
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. |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
|
Yeah, that seems reasonable. This is bringing the defaults in line when you actually set up a structure using GIT_MERGE_OPTS_INIT versus simply passing NULL for the options. I added a change log entry to reflect that. |
Sorry, something went wrong.
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
2 participants
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_RENAMES is set, provide a default for rename_threshold when it is unset.
The merge machinery expects rename_threshold to be nonzero if GIT_MERGE_FIND_RENAMES is set. Previously, a consumer could set GIT_MERGE_FIND_RENAMES but leave rename_threshold unset and merge would get terribly confused.
Fixes #4035