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 /builtin | |
| parent | sequencer: convert fast_forward_to to struct object_id (diff) | |
| download | tgif-f06e90dac1f63f46d299ca728464fb0a450f6972.tar.xz | |
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 'builtin')
| -rw-r--r-- | builtin/merge.c | 4 | ||||
| -rw-r--r-- | builtin/pull.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index f11b5f3de4..5ea7f7da9a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -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; diff --git a/builtin/pull.c b/builtin/pull.c index 2ffb6569a9..318c273eb3 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -523,7 +523,7 @@ static int pull_into_void(const struct object_id *merge_head, * index/worktree changes that the user already made on the unborn * branch. */ - if (checkout_fast_forward(EMPTY_TREE_SHA1_BIN, merge_head->hash, 0)) + if (checkout_fast_forward(&empty_tree_oid, merge_head, 0)) return 1; if (update_ref("initial pull", "HEAD", merge_head->hash, curr_head->hash, 0, UPDATE_REFS_DIE_ON_ERR)) @@ -839,7 +839,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) "fast-forwarding your working tree from\n" "commit %s."), oid_to_hex(&orig_head)); - if (checkout_fast_forward(orig_head.hash, curr_head.hash, 0)) + if (checkout_fast_forward(&orig_head, &curr_head, 0)) die(_("Cannot fast-forward your working tree.\n" "After making sure that you saved anything precious from\n" "$ git diff %s\n" |