mingw: use lowercase includes for some Windows headers

[thirdparty/git.git] / parse-options-cb.c

diff --git a/parse-options-cb.c b/parse-options-cb.c
index 8eb96c5ca9b6119cc8ba25d2b8db6c259310cb0a..a24521dee0fca3de6284a9c59cd3bd8cefdb4942 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -1,9 +1,12 @@
 #include "git-compat-util.h"
 #include "parse-options.h"
 #include "branch.h"
-#include "cache.h"
 #include "commit.h"
 #include "color.h"
+#include "date.h"
+#include "environment.h"
+#include "gettext.h"
+#include "object-name.h"
 #include "string-list.h"
 #include "strvec.h"
 #include "oid-array.h"
@@ -91,7 +94,7 @@ int parse_opt_commits(const struct option *opt, const char *arg, int unset)
 
        if (!arg)
                return -1;
-       if (get_oid(arg, &oid))
+       if (repo_get_oid(the_repository, arg, &oid))
                return error("malformed object name %s", arg);
        commit = lookup_commit_reference(the_repository, &oid);
        if (!commit)
@@ -110,7 +113,7 @@ int parse_opt_commit(const struct option *opt, const char *arg, int unset)
 
        if (!arg)
                return -1;
-       if (get_oid(arg, &oid))
+       if (repo_get_oid(the_repository, arg, &oid))
                return error("malformed object name %s", arg);
        commit = lookup_commit_reference(the_repository, &oid);
        if (!commit)
@@ -129,7 +132,7 @@ int parse_opt_object_name(const struct option *opt, const char *arg, int unset)
        }
        if (!arg)
                return -1;
-       if (get_oid(arg, &oid))
+       if (repo_get_oid(the_repository, arg, &oid))
                return error(_("malformed object name '%s'"), arg);
        oid_array_append(opt->value, &oid);
        return 0;
@@ -146,7 +149,7 @@ int parse_opt_object_id(const struct option *opt, const char *arg, int unset)
        }
        if (!arg)
                return -1;
-       if (get_oid(arg, &oid))
+       if (repo_get_oid(the_repository, arg, &oid))
                return error(_("malformed object name '%s'"), arg);
        *target = oid;
        return 0;
@@ -229,21 +232,6 @@ int parse_opt_noop_cb(const struct option *opt, const char *arg, int unset)
        return 0;
 }
 
-/**
- * Report that the option is unknown, so that other code can handle
- * it. This can be used as a callback together with
- * OPTION_LOWLEVEL_CALLBACK to allow an option to be documented in the
- * "-h" output even if it's not being handled directly by
- * parse_options().
- */
-enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
-                                          const struct option *opt,
-                                          const char *arg, int unset)
-{
-       BUG_ON_OPT_ARG(arg);
-       return PARSE_OPT_UNKNOWN;
-}
-
 /**
  * Recreates the command-line option in the strbuf.
  */