@@ -154,8 +154,9 @@ def test_inmemory_already_applied_patch
154
154
end
155
155
156
156
def test_rebase_does_not_lose_files
157
- commit = Rugged ::Commit . create ( @repo , {
157
+ Rugged ::Commit . create ( @repo , {
158
158
:author => { :email => "[email protected] " , :time => Time . now , :name => "Rebaser" } ,
159
+ :committer => { :email => "[email protected] " , :time => Time . now , :name => "Rebaser" } ,
159
160
:message => "Add some files" ,
160
161
:parents => [ @repo . branches [ "gravy" ] . target_id ] ,
161
162
:update_ref => "refs/heads/gravy" ,
@@ -170,16 +171,17 @@ def test_rebase_does_not_lose_files
170
171
171
172
rebase = Rugged ::Rebase . new ( @repo , "refs/heads/gravy" , "refs/heads/veal" )
172
173
173
- rebase . next
174
+ assert rebase . next
174
175
assert rebase . commit ( { committer :
{ :email => "[email protected] " , :name => "Rebaser" } } )
175
176
176
- rebase . next
177
+ assert rebase . next
177
178
assert rebase . commit ( { committer :
{ :email => "[email protected] " , :name => "Rebaser" } } )
178
179
end
179
180
180
181
def test_inmemory_rebase_does_not_lose_files
181
- commit = Rugged ::Commit . create ( @repo , {
182
+ Rugged ::Commit . create ( @repo , {
182
183
:author => { :email => "[email protected] " , :time => Time . now , :name => "Rebaser" } ,
184
+ :committer => { :email => "[email protected] " , :time => Time . now , :name => "Rebaser" } ,
183
185
:message => "Add some files" ,
184
186
:parents => [ @repo . branches [ "gravy" ] . target_id ] ,
185
187
:update_ref => "refs/heads/gravy" ,
@@ -194,10 +196,10 @@ def test_inmemory_rebase_does_not_lose_files
194
196
195
197
rebase = Rugged ::Rebase . new ( @repo , "refs/heads/gravy" , "refs/heads/veal" , inmemory : true )
196
198
197
- rebase . next
199
+ assert rebase . next
198
200
assert rebase . commit ( { committer :
{ :email => "[email protected] " , :name => "Rebaser" } } )
199
201
200
- rebase . next
202
+ assert rebase . next
201
203
assert rebase . commit ( { committer :
{ :email => "[email protected] " , :name => "Rebaser" } } )
202
204
end
203
205
end
0 commit comments