Merge branch 'en/sparse-checkout-eoo'
"git sparse-checkout (add|set) --[no-]cone --end-of-options" did not handle "--end-of-options" correctly after a recent update. * en/sparse-checkout-eoo: sparse-checkout: be consistent with end of options markers
This commit is contained in:
@ -773,8 +773,7 @@ static int sparse_checkout_add(int argc, const char **argv, const char *prefix)
|
||||
|
||||
argc = parse_options(argc, argv, prefix,
|
||||
builtin_sparse_checkout_add_options,
|
||||
builtin_sparse_checkout_add_usage,
|
||||
PARSE_OPT_KEEP_UNKNOWN_OPT);
|
||||
builtin_sparse_checkout_add_usage, 0);
|
||||
|
||||
sanitize_paths(argc, argv, prefix, add_opts.skip_checks);
|
||||
|
||||
@ -820,8 +819,7 @@ static int sparse_checkout_set(int argc, const char **argv, const char *prefix)
|
||||
|
||||
argc = parse_options(argc, argv, prefix,
|
||||
builtin_sparse_checkout_set_options,
|
||||
builtin_sparse_checkout_set_usage,
|
||||
PARSE_OPT_KEEP_UNKNOWN_OPT);
|
||||
builtin_sparse_checkout_set_usage, 0);
|
||||
|
||||
if (update_modes(&set_opts.cone_mode, &set_opts.sparse_index))
|
||||
return 1;
|
||||
@ -992,8 +990,7 @@ static int sparse_checkout_check_rules(int argc, const char **argv, const char *
|
||||
|
||||
argc = parse_options(argc, argv, prefix,
|
||||
builtin_sparse_checkout_check_rules_options,
|
||||
builtin_sparse_checkout_check_rules_usage,
|
||||
PARSE_OPT_KEEP_UNKNOWN_OPT);
|
||||
builtin_sparse_checkout_check_rules_usage, 0);
|
||||
|
||||
if (check_rules_opts.rules_file && check_rules_opts.cone_mode < 0)
|
||||
check_rules_opts.cone_mode = 1;
|
||||
|
Reference in New Issue
Block a user