submodule.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/pull.c b/builtin/pull.c
index 33b7100837d6b49f13d5f2d80336cd36d8cb126a..9c455984d1b64ce19db937ca503a6aedf4d4acbf 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -944,7 +944,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
                int ret = 0;
                if ((recurse_submodules == RECURSE_SUBMODULES_ON ||
                     recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
                int ret = 0;
                if ((recurse_submodules == RECURSE_SUBMODULES_ON ||
                     recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&

-                   submodule_touches_in_range(&rebase_fork_point, &curr_head))
+                   submodule_touches_in_range(&the_index, &rebase_fork_point, &curr_head))

                        die(_("cannot rebase with locally recorded submodule modifications"));
                if (!autostash) {
                        struct commit_list *list = NULL;
                        die(_("cannot rebase with locally recorded submodule modifications"));
                if (!autostash) {
                        struct commit_list *list = NULL;

diff --git a/submodule.c b/submodule.c
index a2b266fbfae2cd89b00a11008fbcd28bf09777e2..58427b5dfcb27fb3a33c3edef51f4eaf2af06f21 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -766,7 +766,8 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q,
  * have a corresponding 'struct oid_array' (in the 'util' field) which lists
  * what the submodule pointers were updated to during the change.
  */
  * have a corresponding 'struct oid_array' (in the 'util' field) which lists
  * what the submodule pointers were updated to during the change.
  */

-static void collect_changed_submodules(struct string_list *changed,
+static void collect_changed_submodules(struct index_state *istate,
+                                      struct string_list *changed,

                                       struct argv_array *argv)
 {
        struct rev_info rev;
                                       struct argv_array *argv)
 {
        struct rev_info rev;


@@ -930,8 +931,10 @@ static int submodule_needs_pushing(const char *path, struct oid_array *commits)
        return 0;
 }
 
        return 0;
 }
 

-int find_unpushed_submodules(struct oid_array *commits,
-               const char *remotes_name, struct string_list *needs_pushing)
+int find_unpushed_submodules(struct index_state *istate,
+                            struct oid_array *commits,
+                            const char *remotes_name,
+                            struct string_list *needs_pushing)

 {
        struct string_list submodules = STRING_LIST_INIT_DUP;
        struct string_list_item *name;
 {
        struct string_list submodules = STRING_LIST_INIT_DUP;
        struct string_list_item *name;


@@ -943,7 +946,7 @@ int find_unpushed_submodules(struct oid_array *commits,
        argv_array_push(&argv, "--not");
        argv_array_pushf(&argv, "--remotes=%s", remotes_name);
 
        argv_array_push(&argv, "--not");
        argv_array_pushf(&argv, "--remotes=%s", remotes_name);
 

-       collect_changed_submodules(&submodules, &argv);
+       collect_changed_submodules(istate, &submodules, &argv);

 
        for_each_string_list_item(name, &submodules) {
                struct oid_array *commits = name->util;
 
        for_each_string_list_item(name, &submodules) {
                struct oid_array *commits = name->util;


@@ -1044,7 +1047,8 @@ static void submodule_push_check(const char *path, const char *head,
                die("process for submodule '%s' failed", path);
 }
 
                die("process for submodule '%s' failed", path);
 }
 

-int push_unpushed_submodules(struct oid_array *commits,
+int push_unpushed_submodules(struct index_state *istate,
+                            struct oid_array *commits,

                             const struct remote *remote,
                             const struct refspec *rs,
                             const struct string_list *push_options,
                             const struct remote *remote,
                             const struct refspec *rs,
                             const struct string_list *push_options,


@@ -1053,7 +1057,8 @@ int push_unpushed_submodules(struct oid_array *commits,
        int i, ret = 1;
        struct string_list needs_pushing = STRING_LIST_INIT_DUP;
 
        int i, ret = 1;
        struct string_list needs_pushing = STRING_LIST_INIT_DUP;
 

-       if (!find_unpushed_submodules(commits, remote->name, &needs_pushing))
+       if (!find_unpushed_submodules(istate, commits,
+                                     remote->name, &needs_pushing))

                return 1;
 
        /*
                return 1;
 
        /*


@@ -1110,7 +1115,7 @@ void check_for_new_submodule_commits(struct object_id *oid)
        oid_array_append(&ref_tips_after_fetch, oid);
 }
 
        oid_array_append(&ref_tips_after_fetch, oid);
 }
 

-static void calculate_changed_submodule_paths(void)
+static void calculate_changed_submodule_paths(struct index_state *istate)

 {
        struct argv_array argv = ARGV_ARRAY_INIT;
        struct string_list changed_submodules = STRING_LIST_INIT_DUP;
 {
        struct argv_array argv = ARGV_ARRAY_INIT;
        struct string_list changed_submodules = STRING_LIST_INIT_DUP;


@@ -1131,7 +1136,7 @@ static void calculate_changed_submodule_paths(void)
         * Collect all submodules (whether checked out or not) for which new
         * commits have been recorded upstream in "changed_submodule_names".
         */
         * Collect all submodules (whether checked out or not) for which new
         * commits have been recorded upstream in "changed_submodule_names".
         */

-       collect_changed_submodules(&changed_submodules, &argv);
+       collect_changed_submodules(istate, &changed_submodules, &argv);

 
        for_each_string_list_item(name, &changed_submodules) {
                struct oid_array *commits = name->util;
 
        for_each_string_list_item(name, &changed_submodules) {
                struct oid_array *commits = name->util;


@@ -1158,7 +1163,8 @@ static void calculate_changed_submodule_paths(void)
        initialized_fetch_ref_tips = 0;
 }
 
        initialized_fetch_ref_tips = 0;
 }
 

-int submodule_touches_in_range(struct object_id *excl_oid,
+int submodule_touches_in_range(struct index_state *istate,
+                              struct object_id *excl_oid,

                               struct object_id *incl_oid)
 {
        struct string_list subs = STRING_LIST_INIT_DUP;
                               struct object_id *incl_oid)
 {
        struct string_list subs = STRING_LIST_INIT_DUP;


@@ -1176,7 +1182,7 @@ int submodule_touches_in_range(struct object_id *excl_oid,
                argv_array_push(&args, oid_to_hex(excl_oid));
        }
 
                argv_array_push(&args, oid_to_hex(excl_oid));
        }
 

-       collect_changed_submodules(&subs, &args);
+       collect_changed_submodules(istate, &subs, &args);

        ret = subs.nr;
 
        argv_array_clear(&args);
        ret = subs.nr;
 
        argv_array_clear(&args);


@@ -1346,7 +1352,7 @@ int fetch_populated_submodules(struct repository *r,
        argv_array_push(&spf.args, "--recurse-submodules-default");
        /* default value, "--submodule-prefix" and its value are added later */
 
        argv_array_push(&spf.args, "--recurse-submodules-default");
        /* default value, "--submodule-prefix" and its value are added later */
 

-       calculate_changed_submodule_paths();
+       calculate_changed_submodule_paths(r->index);

        run_processes_parallel(max_parallel_jobs,
                               get_next_submodule,
                               fetch_start_failure,
        run_processes_parallel(max_parallel_jobs,
                               get_next_submodule,
                               fetch_start_failure,

diff --git a/submodule.h b/submodule.h
index e452919aa467413107ea749fe90b17e4e3e198c4..4826601ff2f2b53d1bc0db03779e6a151fccadc5 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -102,13 +102,16 @@ int add_submodule_odb(const char *path);
  * Checks if there are submodule changes in a..b. If a is the null OID,
  * checks b and all its ancestors instead.
  */
  * Checks if there are submodule changes in a..b. If a is the null OID,
  * checks b and all its ancestors instead.
  */

-int submodule_touches_in_range(struct object_id *a,
+int submodule_touches_in_range(struct index_state *istate,
+                              struct object_id *a,

                               struct object_id *b);
                               struct object_id *b);

-int find_unpushed_submodules(struct oid_array *commits,
+int find_unpushed_submodules(struct index_state *istate,
+                            struct oid_array *commits,

                             const char *remotes_name,
                             struct string_list *needs_pushing);
 struct refspec;
                             const char *remotes_name,
                             struct string_list *needs_pushing);
 struct refspec;

-int push_unpushed_submodules(struct oid_array *commits,
+int push_unpushed_submodules(struct index_state *istate,
+                            struct oid_array *commits,

                             const struct remote *remote,
                             const struct refspec *rs,
                             const struct string_list *push_options,
                             const struct remote *remote,
                             const struct refspec *rs,
                             const struct string_list *push_options,

diff --git a/transport.c b/transport.c
index 06ffea277460d68694aa4700b269601b56dd46ce..cb40a23d4558af9087473bd5fb5721b25a5e042b 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1139,7 +1139,8 @@ int transport_push(struct transport *transport,
                                        oid_array_append(&commits,
                                                          &ref->new_oid);
 
                                        oid_array_append(&commits,
                                                          &ref->new_oid);
 

-                       if (!push_unpushed_submodules(&commits,
+                       if (!push_unpushed_submodules(&the_index,
+                                                     &commits,

                                                      transport->remote,
                                                      rs,
                                                      transport->push_options,
                                                      transport->remote,
                                                      rs,
                                                      transport->push_options,


@@ -1163,8 +1164,10 @@ int transport_push(struct transport *transport,
                                        oid_array_append(&commits,
                                                          &ref->new_oid);
 
                                        oid_array_append(&commits,
                                                          &ref->new_oid);
 

-                       if (find_unpushed_submodules(&commits, transport->remote->name,
-                                               &needs_pushing)) {
+                       if (find_unpushed_submodules(&the_index,
+                                                    &commits,
+                                                    transport->remote->name,
+                                                    &needs_pushing)) {

                                oid_array_clear(&commits);
                                die_with_unpushed_submodules(&needs_pushing);
                        }
                                oid_array_clear(&commits);
                                die_with_unpushed_submodules(&needs_pushing);
                        }