diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:23 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:47 -0700 |
| commit | fc5cb99f675b2052f6d6bd3e2520379031b12267 (patch) | |
| tree | 9f45a583e635e24dafac4a5bf6118142314e4c6c /sequencer.c | |
| parent | builtin/write-tree: convert to struct object_id (diff) | |
| download | tgif-fc5cb99f675b2052f6d6bd3e2520379031b12267.tar.xz | |
cache-tree: convert write_*_as_tree to object_id
Convert write_index_as_tree and write_cache_as_tree to use struct
object_id.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index 969755b7e0..c8160e974d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1113,7 +1113,7 @@ static int try_to_commit(struct strbuf *msg, const char *author, commit_list_insert(current_head, &parents); } - if (write_cache_as_tree(tree.hash, 0, NULL)) { + if (write_cache_as_tree(&tree, 0, NULL)) { res = error(_("git write-tree failed to write a tree")); goto out; } @@ -1475,7 +1475,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, * that represents the "current" state for merge-recursive * to work on. */ - if (write_cache_as_tree(head.hash, 0, NULL)) + if (write_cache_as_tree(&head, 0, NULL)) return error(_("your index file is unmerged.")); } else { unborn = get_oid("HEAD", &head); |