diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:58 +0900 |
| commit | f06e90dac1f63f46d299ca728464fb0a450f6972 (patch) | |
| tree | 6b64076fb7d478c523ca915892f497b9d75b8932 /sequencer.c | |
| parent | ace976b26ced2f35415119984f9d58d26b478afd (diff) | |
| download | git-f06e90dac1f63f46d299ca728464fb0a450f6972.tar.gz | |
merge: convert checkout_fast_forward to struct object_id
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 9ca352ac78..dcc56a2b69 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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))); |