Skip to content

Fix commit tree with multiple parents #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix commit tree with multiple parents #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08ddf5f
Fix commit tree with multiple parents
maths22 Oct 20, 2023
f279c46
Merge branch 'master' into patch-1
jcouball Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions lib/git/lib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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] }.flatten

I think calling #to_a if #to_ary doesn't exist would be the desired behavior.

[]
elsif opts[:parents].respond_to?(:to_ary)
opts[:parents].to_ary || [opts[:parents]]
else
[opts[:parents]]
end
parents << opts[:parent] if opts[:parent]

arr_opts = []
arr_opts << tree
arr_opts << '-p' << opts[:parent] if opts[:parent]
arr_opts += [opts[:parents]].map { |p| ['-p', p] }.flatten if opts[:parents]
arr_opts += parents.map { |p| ['-p', p] }.flatten
command('commit-tree', *arr_opts, redirect: "< #{escape t.path}")
end

Expand Down
8 changes: 8 additions & 0 deletions tests/units/test_tree_ops.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ def test_read_tree
assert(c.commit?)
assert_equal('b40f7a9072cdec637725700668f8fdebe39e6d38', c.gtree.sha)

c = g.commit_tree(tr, :parent => 'HEAD')
assert(c.commit?)
assert_equal('b40f7a9072cdec637725700668f8fdebe39e6d38', c.gtree.sha)

c = g.commit_tree(tr, :parents => ['HEAD', 'testbranch1'])
assert(c.commit?)
assert_equal('b40f7a9072cdec637725700668f8fdebe39e6d38', c.gtree.sha)

tmp = Tempfile.new('tesxt')
tmppath = tmp.path
tmp.close
Expand Down