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

2
sequencer.c
View File

@ -382,7 +382,7 @@ static int fast_forward_to(const struct object_id *to, const struct object_id *f
struct strbuf err = STRBUF_INIT;
read_cache();
if (checkout_fast_forward(from->hash, to->hash, 1))
if (checkout_fast_forward(from, to, 1))
return -1; /* the callee should have complained already */
strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts)));