Allow disabling rename detection for merge operations. #679
Conversation
This file contains 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
ethomson
reviewed
Feb 8, 2017
ext/rugged/rugged_tree.c
Outdated
| @@ -489,6 +489,8 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options) | |||
|
|
|||
| if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("renames")))) { | |||
| opts->flags |= GIT_MERGE_FIND_RENAMES; | |||
| } else { | |||
| opts->flags &= ~GIT_MERGE_FIND_RENAMES; | |||
There was a problem hiding this comment.
You could drop the first test, since this is set already, and just if (!RTEST...) and unset that bit.
There was a problem hiding this comment.
Entirely optional, of course. I'm going to 👍 this either way of course. 😄
There was a problem hiding this comment.
!RTEST won't work here because nil also evaluates to 0 with RTEST and not specifying this option would clear it 😖.
arthurschreiber
force-pushed
the
arthur/disable-rename-detection-for-merge
branch
from
571f5b0
to
e8afe33
Compare
ethomson
approved these changes
Feb 8, 2017
| @@ -487,8 +487,8 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options) | |||
| } | |||
| } | |||
|
|
|||
| if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("renames")))) { | |||
| opts->flags |= GIT_MERGE_FIND_RENAMES; | |||
| if (rb_hash_aref(rb_options, CSTR2SYM("renames")) == Qfalse) { | |||
There was a problem hiding this comment.
Ah of course. Sorry, I now realize that my prior suggestion doesn't make sense. 😀
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.
The default for rename detection for merge operations changed in the latest libgit2 version from being disabled to being enabled. This change allows users to specify
renames: falseto disable this detection.