diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-12-28 10:41:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-15 15:38:29 -0800 |
| commit | 0aa9d8aa6ce429f0fa04e1ca819ed766c211e242 (patch) | |
| tree | a1300182f22bf55f45b5769673cabc6535666dd7 /builtin/commit.c | |
| parent | Merge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth (diff) | |
| parent | rebase-interactive.c: remove the_repository references (diff) | |
| download | tgif-0aa9d8aa6ce429f0fa04e1ca819ed766c211e242.tar.xz | |
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index c021b119bb..004b816635 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -188,7 +188,7 @@ static void determine_whence(struct wt_status *s) static void status_init_config(struct wt_status *s, config_fn_t fn) { - wt_status_prepare(s); + wt_status_prepare(the_repository, s); init_diff_ui_defaults(); git_config(fn, s); determine_whence(s); @@ -911,7 +911,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (ignore_submodule_arg && !strcmp(ignore_submodule_arg, "all")) flags.ignore_submodules = 1; - committable = index_differs_from(parent, &flags, 1); + committable = index_differs_from(the_repository, + parent, &flags, 1); } } strbuf_release(&committer_ident); @@ -1682,7 +1683,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) flags |= SUMMARY_INITIAL_COMMIT; if (author_date_is_interesting()) flags |= SUMMARY_SHOW_AUTHOR_DATE; - print_commit_summary(prefix, &oid, flags); + print_commit_summary(the_repository, prefix, + &oid, flags); } UNLEAK(err); |