mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: convert checkout_fast_forward to struct object_id

Browse Source 
Converting checkout_fast_forward is required to convert
parse_tree_indirect.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2017-05-06 22:10:33 +00:00
committed by Junio C Hamano
parent ace976b26c
commit f06e90dac1
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -1372,8 +1372,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
goto done;
}
if (checkout_fast_forward(head_commit->object.oid.hash,
commit->object.oid.hash,
if (checkout_fast_forward(&head_commit->object.oid,
&commit->object.oid,
overwrite_ignore)) {
ret = 1;
goto done;