submodule: convert push_unpushed_submodules to take a struct refspec

Convert 'push_unpushed_submodules()' to take a 'struct refspec' as a
parameter instead of an array of 'const char *'.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/submodule.c b/submodule.c
index 74d35b25779f4f771cc9d9ababe3a75cb04ac81c..cdeadd80e7890ce3ed77ce3793f4468033c7b3bb 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -968,7 +968,7 @@ int find_unpushed_submodules(struct oid_array *commits,
 
 static int push_submodule(const char *path,
                          const struct remote *remote,
 
 static int push_submodule(const char *path,
                          const struct remote *remote,

-                         const char **refspec, int refspec_nr,
+                         const struct refspec *rs,

                          const struct string_list *push_options,
                          int dry_run)
 {
                          const struct string_list *push_options,
                          int dry_run)
 {


@@ -991,8 +991,8 @@ static int push_submodule(const char *path,
                if (remote->origin != REMOTE_UNCONFIGURED) {
                        int i;
                        argv_array_push(&cp.args, remote->name);
                if (remote->origin != REMOTE_UNCONFIGURED) {
                        int i;
                        argv_array_push(&cp.args, remote->name);

-                       for (i = 0; i < refspec_nr; i++)
-                               argv_array_push(&cp.args, refspec[i]);
+                       for (i = 0; i < rs->raw_nr; i++)
+                               argv_array_push(&cp.args, rs->raw[i]);

                }
 
                prepare_submodule_repo_env(&cp.env_array);
                }
 
                prepare_submodule_repo_env(&cp.env_array);


@@ -1013,7 +1013,7 @@ static int push_submodule(const char *path,
  */
 static void submodule_push_check(const char *path, const char *head,
                                 const struct remote *remote,
  */
 static void submodule_push_check(const char *path, const char *head,
                                 const struct remote *remote,

-                                const char **refspec, int refspec_nr)
+                                const struct refspec *rs)

 {
        struct child_process cp = CHILD_PROCESS_INIT;
        int i;
 {
        struct child_process cp = CHILD_PROCESS_INIT;
        int i;


@@ -1023,8 +1023,8 @@ static void submodule_push_check(const char *path, const char *head,
        argv_array_push(&cp.args, head);
        argv_array_push(&cp.args, remote->name);
 
        argv_array_push(&cp.args, head);
        argv_array_push(&cp.args, remote->name);
 

-       for (i = 0; i < refspec_nr; i++)
-               argv_array_push(&cp.args, refspec[i]);
+       for (i = 0; i < rs->raw_nr; i++)
+               argv_array_push(&cp.args, rs->raw[i]);

 
        prepare_submodule_repo_env(&cp.env_array);
        cp.git_cmd = 1;
 
        prepare_submodule_repo_env(&cp.env_array);
        cp.git_cmd = 1;


@@ -1043,7 +1043,7 @@ static void submodule_push_check(const char *path, const char *head,
 
 int push_unpushed_submodules(struct oid_array *commits,
                             const struct remote *remote,
 
 int push_unpushed_submodules(struct oid_array *commits,
                             const struct remote *remote,

-                            const char **refspec, int refspec_nr,
+                            const struct refspec *rs,

                             const struct string_list *push_options,
                             int dry_run)
 {
                             const struct string_list *push_options,
                             int dry_run)
 {


@@ -1069,8 +1069,7 @@ int push_unpushed_submodules(struct oid_array *commits,
 
                for (i = 0; i < needs_pushing.nr; i++)
                        submodule_push_check(needs_pushing.items[i].string,
 
                for (i = 0; i < needs_pushing.nr; i++)
                        submodule_push_check(needs_pushing.items[i].string,

-                                            head, remote,
-                                            refspec, refspec_nr);
+                                            head, remote, rs);

                free(head);
        }
 
                free(head);
        }
 


@@ -1078,7 +1077,7 @@ int push_unpushed_submodules(struct oid_array *commits,
        for (i = 0; i < needs_pushing.nr; i++) {
                const char *path = needs_pushing.items[i].string;
                fprintf(stderr, "Pushing submodule '%s'\n", path);
        for (i = 0; i < needs_pushing.nr; i++) {
                const char *path = needs_pushing.items[i].string;
                fprintf(stderr, "Pushing submodule '%s'\n", path);

-               if (!push_submodule(path, remote, refspec, refspec_nr,
+               if (!push_submodule(path, remote, rs,

                                    push_options, dry_run)) {
                        fprintf(stderr, "Unable to push submodule '%s'\n", path);
                        ret = 0;
                                    push_options, dry_run)) {
                        fprintf(stderr, "Unable to push submodule '%s'\n", path);
                        ret = 0;

diff --git a/submodule.h b/submodule.h
index e5526f6aaab93f85d279e89fc33b8e2e8740c32a..aae0c9c8fffebb5bc256f6d6bf2cef3590d80bfc 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -100,9 +100,10 @@ extern int submodule_touches_in_range(struct object_id *a,
 extern int find_unpushed_submodules(struct oid_array *commits,
                                    const char *remotes_name,
                                    struct string_list *needs_pushing);
 extern int find_unpushed_submodules(struct oid_array *commits,
                                    const char *remotes_name,
                                    struct string_list *needs_pushing);

+struct refspec;

 extern int push_unpushed_submodules(struct oid_array *commits,
                                    const struct remote *remote,
 extern int push_unpushed_submodules(struct oid_array *commits,
                                    const struct remote *remote,

-                                   const char **refspec, int refspec_nr,
+                                   const struct refspec *rs,

                                    const struct string_list *push_options,
                                    int dry_run);
 /*
                                    const struct string_list *push_options,
                                    int dry_run);
 /*

diff --git a/transport.c b/transport.c
index e32bc320cf63f3264363ee9b5f0304684c7a5e47..7e0b9abba3007cd859b98c20e3b8663a3ab3315a 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1157,7 +1157,7 @@ int transport_push(struct transport *transport,
 
                        if (!push_unpushed_submodules(&commits,
                                                      transport->remote,
 
                        if (!push_unpushed_submodules(&commits,
                                                      transport->remote,

-                                                     rs->raw, rs->raw_nr,
+                                                     rs,

                                                      transport->push_options,
                                                      pretend)) {
                                oid_array_clear(&commits);
                                                      transport->push_options,
                                                      pretend)) {
                                oid_array_clear(&commits);