submodule--helper: convert push_check to use struct refspec

Convert 'push_check()' to use 'struct refspec'.

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

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index c0c4db00736597eca7c264f70b0fc82c0246ce53..88a149a2c3846cb0dc103de62a72d256e282e566 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1744,13 +1744,14 @@ static int push_check(int argc, const char **argv, const char *prefix)
 
        /* Check the refspec */
        if (argc > 2) {
 
        /* Check the refspec */
        if (argc > 2) {

-               int i, refspec_nr = argc - 2;
+               int i;

                struct ref *local_refs = get_local_heads();
                struct ref *local_refs = get_local_heads();

-               struct refspec_item *refspec = parse_push_refspec(refspec_nr,
-                                                            argv + 2);
+               struct refspec refspec = REFSPEC_INIT_PUSH;

 
 

-               for (i = 0; i < refspec_nr; i++) {
-                       struct refspec_item *rs = refspec + i;
+               refspec_appendn(&refspec, argv + 2, argc - 2);
+
+               for (i = 0; i < refspec.nr; i++) {
+                       const struct refspec_item *rs = &refspec.items[i];

 
                        if (rs->pattern || rs->matching)
                                continue;
 
                        if (rs->pattern || rs->matching)
                                continue;


@@ -1777,7 +1778,7 @@ static int push_check(int argc, const char **argv, const char *prefix)
                                    rs->src);
                        }
                }
                                    rs->src);
                        }
                }

-               free_refspec(refspec_nr, refspec);
+               refspec_clear(&refspec);

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