Fix commit tree with multiple parents #674
Closed
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
Signed-off-by: Jacob Burroughs <jburroughs@instructure.com>
jcouball
reviewed
Nov 21, 2023
| @@ -1040,10 +1040,19 @@ def commit_tree(tree, opts = {}) | |||
| t.write(opts[:message]) | |||
| t.close | |||
|
|
|||
| # Adapted from activesupport Array.wrap | |||
| parents = if opts[:parents].nil? | |||
There was a problem hiding this comment.
I read up on Array.wrap but don't understand why you would choose that implementation instead of Kernel#Array. I am interested to hear why you would go this route instead of reducing this change to:
arr_opts += Array(opts[:parent]).map { |p| ['-p', p] }.flattenI think calling #to_a if #to_ary doesn't exist would be the desired behavior.
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.
Your checklist for this pull request
🚨Please review the guidelines for contributing to this repository.
Description
This change fixes commit_tree to actually pass through multiple parents
correctly, while preserving backwards-compatibility by still handling
single commits passed into the
parentsfield.