diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 06:48:49 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-12 14:50:05 +0900 |
| commit | 5b02ca38a30298a963b3595f2cd884e11cf10c09 (patch) | |
| tree | 27e8e4a3773307ff5087ec29c3ecbb5982350004 /sequencer.c | |
| parent | Ninth batch for 2.20 (diff) | |
| download | tgif-5b02ca38a30298a963b3595f2cd884e11cf10c09.tar.xz | |
wt-status.c: remove implicit dependency on the_index
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sequencer.c b/sequencer.c index 9e1ab3a2a7..0b8f18fd36 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2773,7 +2773,7 @@ static int do_exec(const char *command_line) if (discard_cache() < 0 || read_cache() < 0) return error(_("could not read index")); - dirty = require_clean_work_tree("rebase", NULL, 1, 1); + dirty = require_clean_work_tree(the_repository, "rebase", NULL, 1, 1); if (status) { warning(_("execution failed: %s\n%s" @@ -3714,10 +3714,10 @@ static int commit_staged_changes(struct replay_opts *opts, unsigned int flags = ALLOW_EMPTY | EDIT_MSG; unsigned int final_fixup = 0, is_clean; - if (has_unstaged_changes(1)) + if (has_unstaged_changes(the_repository, 1)) return error(_("cannot rebase: You have unstaged changes.")); - is_clean = !has_uncommitted_changes(0); + is_clean = !has_uncommitted_changes(the_repository, 0); if (file_exists(rebase_path_amend())) { struct strbuf rev = STRBUF_INIT; @@ -4847,7 +4847,7 @@ int complete_action(struct replay_opts *opts, unsigned flags, if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head)) return -1; ; - if (require_clean_work_tree("rebase", "", 1, 1)) + if (require_clean_work_tree(the_repository, "rebase", "", 1, 1)) return -1; return sequencer_continue(opts); |