diff options
| author | Jeff King <peff@peff.net> | 2016-01-31 06:26:16 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-01 13:43:30 -0800 |
| commit | 5ed5f671c4193f2b9d47c08e989574903f3bf9cc (patch) | |
| tree | 2447fafcbb557c51b191fde384c5ea202327eb92 | |
| parent | 9096ee162b7e4e426b1719bb43f9e42e84c95816 (diff) | |
| download | git-5ed5f671c4193f2b9d47c08e989574903f3bf9cc.tar.gz | |
checkout-index: handle "--no-prefix" option
We use a custom callback to parse "--prefix", but it does
not handle the "unset" case. As a result, passing
"--no-prefix" will cause a segfault.
We can fix this by switching it to an OPT_STRING, which
makes "--no-prefix" counteract a previous "--prefix". Note
that this assigns NULL, so we bump our default-case
initialization to lower in the main function.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/checkout-index.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 3b913d1b37..43beddee13 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -142,14 +142,6 @@ static int option_parse_u(const struct option *opt, return 0; } -static int option_parse_prefix(const struct option *opt, - const char *arg, int unset) -{ - state.base_dir = arg; - state.base_dir_len = strlen(arg); - return 0; -} - static int option_parse_stage(const struct option *opt, const char *arg, int unset) { @@ -191,9 +183,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) N_("read list of paths from the standard input")), OPT_BOOL(0, "temp", &to_tempfile, N_("write the content to temporary files")), - OPT_CALLBACK(0, "prefix", NULL, N_("string"), - N_("when creating files, prepend <string>"), - option_parse_prefix), + OPT_STRING(0, "prefix", &state.base_dir, N_("string"), + N_("when creating files, prepend <string>")), OPT_CALLBACK(0, "stage", NULL, NULL, N_("copy out the files from named stage"), option_parse_stage), @@ -204,7 +195,6 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) 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; if (read_cache() < 0) { @@ -217,6 +207,10 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) state.quiet = quiet; state.not_new = not_new; + if (!state.base_dir) + state.base_dir = ""; + state.base_dir_len = strlen(state.base_dir); + if (state.base_dir_len || to_tempfile) { /* when --prefix is specified we do not * want to update cache. |