diff options
Diffstat (limited to 'merge.c')
-rw-r--r-- | merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -81,7 +81,8 @@ int checkout_fast_forward(struct repository *r, rollback_lock_file(&lock_file); return -1; } - init_tree_desc(t+i, trees[i]->buffer, trees[i]->size); + init_tree_desc(t+i, &trees[i]->object.oid, + trees[i]->buffer, trees[i]->size); } memset(&opts, 0, sizeof(opts)); |