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>

diff --git a/builtin/commit.c b/builtin/commit.c
index e89bf35634a877fcf68efab0c62de8d00649683d..91b19202557b5c1a23dbc11a2a447b8e1388a032 100644 (file)
--- 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;
                        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);
                }
        }
        strbuf_release(&committer_ident);

diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index c84c6e05e922f09692b9b133cd391b850c7951df..0b07263415785e11c7fc5b1a6da40a25e969b73c 100644 (file)
--- 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 (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);
 }
                exit(2);
        exit(0);
 }

diff --git a/diff-lib.c b/diff-lib.c
index 83fce51518854754ee6f4d95cca86d61cc10e4cf..23c8d351b3aa5912c49c9da0eecd8727cf06ac72 100644 (file)
--- 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;
 
 {
        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;
 
        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;
 }
 
        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;
 
                       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);
        memset(&opt, 0, sizeof(opt));
        opt.def = def;
        setup_revisions(0, NULL, &rev, &opt);

diff --git a/diff.h b/diff.h
index ce5e8a8183e848b2e36d50bea271f687a450e3af..3197a976a4d9290ca8c98e94951c62b3abad84ef 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -436,7 +436,8 @@ int diff_result_code(struct diff_options *, int);
 
 void diff_no_index(struct repository *, struct rev_info *, int, const char **);
 
 
 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);
 
 /*
                       int ita_invisible_in_index);
 
 /*

diff --git a/sequencer.c b/sequencer.c
index 726f7276445672cdaa7ce24a38189ab59dd047e7..d726f77e11bf39e44037f65bf7bb561df4fd76bf 100644 (file)
--- 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);
                        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);
        }
                                       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 (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;
                }
                        res = error_dirty_index(r->index, opts);
                        goto release_todo_list;
                }