Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
object: convert parse_object* to take struct object_id
[gitweb.git]
/
sequencer.c
diff --git
a/sequencer.c
b/sequencer.c
index adcc0a953fef533669a9c2deec4b5fbe08c5a6ac..5817d8a23d835ad8417d9a4f2d0dc57df76571f1 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-446,7
+446,7
@@
static int do_recursive_merge(struct commit *base, struct commit *next,
if (is_rebase_i(opts))
o.buffer_output = 2;
- head_tree = parse_tree_indirect(head
->hash
);
+ head_tree = parse_tree_indirect(head);
next_tree = next ? next->tree : empty_tree();
base_tree = base ? base->tree : empty_tree();