Merge pull request #611 from ethomson/update_libgit2

Update libgit2 to 46082c3

Author: Vicent Martí

test/rebase_test.rb

@@ -152,4 +152,54 @@ def test_inmemory_already_applied_patch
     assert_equal :pick, op[:type]
     assert_equal "0f5f6d3353be1a9966fa5767b7d604b051798224", op[:id]
   end
+
+  def test_rebase_does_not_lose_files
+    Rugged::Commit.create(@repo, {
+      :author => { :email => "[email protected]", :time => Time.now, :name => "Rebaser" },
+      :committer => { :email => "[email protected]", :time => Time.now, :name => "Rebaser" },
+      :message => "Add some files",
+      :parents => [ @repo.branches["gravy"].target_id ],
+      :update_ref => "refs/heads/gravy",
+      :tree => @repo.branches["gravy"].target.tree.update([
+        { :action => :upsert,
+          :path => "some/nested/file",
+          :oid => Rugged::Blob.from_buffer(@repo, "a new blob content"),
+          :filemode => 0100644
+        }
+      ])
+    })
+
+    rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal")
+
+    assert rebase.next
+    assert rebase.commit({ committer: { :email => "[email protected]", :name => "Rebaser" } })
+
+    assert rebase.next
+    assert rebase.commit({ committer: { :email => "[email protected]", :name => "Rebaser" } })
+  end
+
+  def test_inmemory_rebase_does_not_lose_files
+    Rugged::Commit.create(@repo, {
+      :author => { :email => "[email protected]", :time => Time.now, :name => "Rebaser" },
+      :committer => { :email => "[email protected]", :time => Time.now, :name => "Rebaser" },
+      :message => "Add some files",
+      :parents => [ @repo.branches["gravy"].target_id ],
+      :update_ref => "refs/heads/gravy",
+      :tree => @repo.branches["gravy"].target.tree.update([
+        { :action => :upsert,
+          :path => "some/nested/file",
+          :oid => Rugged::Blob.from_buffer(@repo, "a new blob content"),
+          :filemode => 0100644
+        }
+      ])
+    })
+
+    rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal", inmemory: true)
+
+    assert rebase.next
+    assert rebase.commit({ committer: { :email => "[email protected]", :name => "Rebaser" } })
+
+    assert rebase.next
+    assert rebase.commit({ committer: { :email => "[email protected]", :name => "Rebaser" } })
+  end
 end