Merge branch 'js/plug-leaks' into maint

diff --git a/parse-options-cb.c b/parse-options-cb.c
index 7baecdc86425f978e896554b823f435a62caad1b..7419780a9b644e74107eec31d1c75156374920b8 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -99,14 +99,14 @@ int parse_opt_object_name(const struct option *opt, const char *arg, int unset)
        struct object_id oid;
 
        if (unset) {
-               sha1_array_clear(opt->value);
+               oid_array_clear(opt->value);
                return 0;
        }
        if (!arg)
                return -1;
        if (get_oid(arg, &oid))
                return error(_("malformed object name '%s'"), arg);
-       sha1_array_append(opt->value, &oid);
+       oid_array_append(opt->value, &oid);
        return 0;
 }