diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 05:49:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 05:50:06 (GMT) |
| commit | ffc00a48efe8f591a05f8e7b61f632bcaf098dde (patch) | |
| tree | 7f45042103cf0de842143abb2d62f790f586dbbc /sequencer.c | |
| parent | 385cb64ff3598451ac3019443b364f49b8395e82 (diff) | |
| download | git-ffc00a48efe8f591a05f8e7b61f632bcaf098dde.zip git-ffc00a48efe8f591a05f8e7b61f632bcaf098dde.tar.gz git-ffc00a48efe8f591a05f8e7b61f632bcaf098dde.tar.bz2 | |
diff-lib.c: remove the_repository references
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
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 726f727..d726f77 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1713,7 +1713,7 @@ static int do_pick_commit(struct repository *r, unborn = 1; } else if (unborn) oidcpy(&head, the_hash_algo->empty_tree); - if (index_differs_from(unborn ? empty_tree_oid_hex() : "HEAD", + if (index_differs_from(r, unborn ? empty_tree_oid_hex() : "HEAD", NULL, 0)) return error_dirty_index(r->index, opts); } @@ -3915,7 +3915,7 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts) if (res) goto release_todo_list; } - if (index_differs_from("HEAD", NULL, 0)) { + if (index_differs_from(r, "HEAD", NULL, 0)) { res = error_dirty_index(r->index, opts); goto release_todo_list; } |