Merge branch 'rs/bisect-start-leakfix'

[thirdparty/git.git] / builtin / bisect--helper.c

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index e90ce49695001ef2fa360a35a7fbbb3a32c138ef..28ef7ec2a48856b1c13f1cdd31546985148752f0 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -329,8 +329,9 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
        return 0;
 }
 
-static int inc_nr(const char *refname, const struct object_id *oid,
-                 int flag, void *cb_data)
+static int inc_nr(const char *refname UNUSED,
+                 const struct object_id *oid UNUSED,
+                 int flag UNUSED, void *cb_data)
 {
        unsigned int *nr = (unsigned int *)cb_data;
        (*nr)++;
@@ -518,7 +519,7 @@ finish:
 }
 
 static int add_bisect_ref(const char *refname, const struct object_id *oid,
-                         int flags, void *cb)
+                         int flags UNUSED, void *cb)
 {
        struct add_bisect_ref_data *data = cb;
 
@@ -1133,8 +1134,9 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a
        return res;
 }
 
-static int get_first_good(const char *refname, const struct object_id *oid,
-                         int flag, void *cb_data)
+static int get_first_good(const char *refname UNUSED,
+                         const struct object_id *oid,
+                         int flag UNUSED, void *cb_data)
 {
        oidcpy(cb_data, oid);
        return 1;
@@ -1323,7 +1325,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 
        argc = parse_options(argc, argv, prefix, options,
                             git_bisect_helper_usage,
-                            PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_UNKNOWN);
+                            PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_UNKNOWN_OPT);
 
        if (!cmdmode)
                usage_with_options(git_bisect_helper_usage, options);