patch-ids.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>

diff --git a/builtin/log.c b/builtin/log.c
index 4b602236d6ee50fff8a08ac23b186e7d6ebd8c22..978fe7c10fab9b0e76dba522e79014bd2a1acabc 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -914,7 +914,7 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids)
        if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
                die(_("Not a range."));
 
        if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
                die(_("Not a range."));
 

-       init_patch_ids(ids);
+       init_patch_ids(the_repository, ids);

 
        /* given a range a..b get all patch ids for b..a */
        init_revisions(&check_rev, rev->prefix);
 
        /* given a range a..b get all patch ids for b..a */
        init_revisions(&check_rev, rev->prefix);

diff --git a/patch-ids.c b/patch-ids.c
index 342950c79d14346252fad24467c809415f3042bf..7da86047d926694775756c601f96362bf8a8490c 100644 (file)
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -56,10 +56,10 @@ static int patch_id_cmp(const void *cmpfn_data,
        return oidcmp(&a->patch_id, &b->patch_id);
 }
 
        return oidcmp(&a->patch_id, &b->patch_id);
 }
 

-int init_patch_ids(struct patch_ids *ids)
+int init_patch_ids(struct repository *r, struct patch_ids *ids)

 {
        memset(ids, 0, sizeof(*ids));
 {
        memset(ids, 0, sizeof(*ids));

-       repo_diff_setup(the_repository, &ids->diffopts);
+       repo_diff_setup(r, &ids->diffopts);

        ids->diffopts.detect_rename = 0;
        ids->diffopts.flags.recursive = 1;
        diff_setup_done(&ids->diffopts);
        ids->diffopts.detect_rename = 0;
        ids->diffopts.flags.recursive = 1;
        diff_setup_done(&ids->diffopts);

diff --git a/patch-ids.h b/patch-ids.h
index 79ac9a8498383b971107f4b30a7a75dbd30613d1..82a12b66f8891e5a9a45c2a63845dd28de7eeda7 100644 (file)
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -6,6 +6,7 @@
 
 struct commit;
 struct object_id;
 
 struct commit;
 struct object_id;

+struct repository;

 
 struct patch_id {
        struct hashmap_entry ent;
 
 struct patch_id {
        struct hashmap_entry ent;


@@ -20,7 +21,7 @@ struct patch_ids {
 
 int commit_patch_id(struct commit *commit, struct diff_options *options,
                    struct object_id *oid, int);
 
 int commit_patch_id(struct commit *commit, struct diff_options *options,
                    struct object_id *oid, int);

-int init_patch_ids(struct patch_ids *);
+int init_patch_ids(struct repository *, struct patch_ids *);

 int free_patch_ids(struct patch_ids *);
 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
 struct patch_id *has_commit_patch_id(struct commit *, struct patch_ids *);
 int free_patch_ids(struct patch_ids *);
 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
 struct patch_id *has_commit_patch_id(struct commit *, struct patch_ids *);

diff --git a/revision.c b/revision.c
index 0c6dc8c163fe2e21040b08b5762fc9409b4fb969..d70587678c278b93ed304f3e8cc5a052d7f5254a 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -877,7 +877,7 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
                return;
 
        left_first = left_count < right_count;
                return;
 
        left_first = left_count < right_count;

-       init_patch_ids(&ids);
+       init_patch_ids(the_repository, &ids);

        ids.diffopts.pathspec = revs->diffopt.pathspec;
 
        /* Compute patch-ids for one side */
        ids.diffopts.pathspec = revs->diffopt.pathspec;
 
        /* Compute patch-ids for one side */