Merge branch 'ef/maint-win-verify-path'

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 1ee30443074bbae67a402c5397b939a716f2a191..f1fec24745a854e77555a1b4bea3bc8d7ab04367 100644 (file)
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -241,6 +241,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage_with_options(builtin_checkout_index_usage,
+                                  builtin_checkout_index_options);
        git_config(git_default_config, NULL);
        state.base_dir = "";
        prefix_length = prefix ? strlen(prefix) : 0;