diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 06:49:04 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 14:50:06 +0900 |
| commit | ffc00a48efe8f591a05f8e7b61f632bcaf098dde (patch) | |
| tree | 7f45042103cf0de842143abb2d62f790f586dbbc | |
| parent | 385cb64ff3598451ac3019443b364f49b8395e82 (diff) | |
| download | git-ffc00a48efe8f591a05f8e7b61f632bcaf098dde.tar.gz | |
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>
| -rw-r--r-- | builtin/commit.c | 3 | ||||
| -rw-r--r-- | builtin/merge-ours.c | 2 | ||||
| -rw-r--r-- | diff-lib.c | 7 | ||||
| -rw-r--r-- | diff.h | 3 | ||||
| -rw-r--r-- | sequencer.c | 4 |
5 files changed, 11 insertions, 8 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index e89bf35634..91b1920255 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -908,7 +908,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); diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index c84c6e05e9..0b07263415 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -26,7 +26,7 @@ int cmd_merge_ours(int argc, const char **argv, const char *prefix) */ if (read_cache() < 0) die_errno("read_cache failed"); - if (index_differs_from("HEAD", NULL, 0)) + if (index_differs_from(the_repository, "HEAD", NULL, 0)) exit(2); exit(0); } diff --git a/diff-lib.c b/diff-lib.c index 83fce51518..23c8d351b3 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -542,7 +542,7 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt) { struct rev_info revs; - repo_init_revisions(the_repository, &revs, NULL); + repo_init_revisions(opt->repo, &revs, NULL); copy_pathspec(&revs.prune_data, &opt->pathspec); revs.diffopt = *opt; @@ -551,13 +551,14 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt) return 0; } -int index_differs_from(const char *def, const struct diff_flags *flags, +int index_differs_from(struct repository *r, + const char *def, const struct diff_flags *flags, int ita_invisible_in_index) { struct rev_info rev; struct setup_revision_opt opt; - repo_init_revisions(the_repository, &rev, NULL); + repo_init_revisions(r, &rev, NULL); memset(&opt, 0, sizeof(opt)); opt.def = def; setup_revisions(0, NULL, &rev, &opt); @@ -436,7 +436,8 @@ int diff_result_code(struct diff_options *, int); void diff_no_index(struct repository *, struct rev_info *, int, const char **); -int index_differs_from(const char *def, const struct diff_flags *flags, +int index_differs_from(struct repository *r, const char *def, + const struct diff_flags *flags, int ita_invisible_in_index); /* diff --git a/sequencer.c b/sequencer.c index 726f727644..d726f77e11 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; } |