mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
checkout-index: propagate errors to exit code
If we encounter an error while checking out an explicit path, we print a
message to stderr but do not actually exit with a non-zero code. While
this is a plumbing command and the behavior goes all the way back to
33db5f4d90
(Add a "checkout-cache" command which does what the name
suggests., 2005-04-09), this is almost certainly an oversight:
- we _do_ return an exit code from checkout_file(); the caller just
never reads it
- errors while checking out all paths (with "-a") do result in a
non-zero exit code.
- it would be quite unusual not to use the exit code for an error,
as otherwise the caller has no idea the command failed except by
scraping stderr
To keep our tests simple and portable, we can use the most obvious
error: asking to checkout a path which is not in the index at all.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0b809c8248
commit
7e41061588
|
@ -167,6 +167,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
|
||||||
int prefix_length;
|
int prefix_length;
|
||||||
int force = 0, quiet = 0, not_new = 0;
|
int force = 0, quiet = 0, not_new = 0;
|
||||||
int index_opt = 0;
|
int index_opt = 0;
|
||||||
|
int err = 0;
|
||||||
struct option builtin_checkout_index_options[] = {
|
struct option builtin_checkout_index_options[] = {
|
||||||
OPT_BOOL('a', "all", &all,
|
OPT_BOOL('a', "all", &all,
|
||||||
N_("check out all files in the index")),
|
N_("check out all files in the index")),
|
||||||
|
@ -231,7 +232,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
|
||||||
if (read_from_stdin)
|
if (read_from_stdin)
|
||||||
die("git checkout-index: don't mix '--stdin' and explicit filenames");
|
die("git checkout-index: don't mix '--stdin' and explicit filenames");
|
||||||
p = prefix_path(prefix, prefix_length, arg);
|
p = prefix_path(prefix, prefix_length, arg);
|
||||||
checkout_file(p, prefix);
|
err |= checkout_file(p, prefix);
|
||||||
free(p);
|
free(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -253,13 +254,16 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
|
||||||
strbuf_swap(&buf, &unquoted);
|
strbuf_swap(&buf, &unquoted);
|
||||||
}
|
}
|
||||||
p = prefix_path(prefix, prefix_length, buf.buf);
|
p = prefix_path(prefix, prefix_length, buf.buf);
|
||||||
checkout_file(p, prefix);
|
err |= checkout_file(p, prefix);
|
||||||
free(p);
|
free(p);
|
||||||
}
|
}
|
||||||
strbuf_release(&unquoted);
|
strbuf_release(&unquoted);
|
||||||
strbuf_release(&buf);
|
strbuf_release(&buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (err)
|
||||||
|
return 1;
|
||||||
|
|
||||||
if (all)
|
if (all)
|
||||||
checkout_all(prefix, prefix_length);
|
checkout_all(prefix, prefix_length);
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ test_expect_success 'checkout all stage 2 to temporary files' '
|
||||||
done
|
done
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_failure 'checkout all stages of unknown path' '
|
test_expect_success 'checkout all stages of unknown path' '
|
||||||
rm -f path* .merge_* actual &&
|
rm -f path* .merge_* actual &&
|
||||||
test_must_fail git checkout-index --stage=all --temp \
|
test_must_fail git checkout-index --stage=all --temp \
|
||||||
-- does-not-exist 2>stderr &&
|
-- does-not-exist 2>stderr &&
|
||||||
|
|
|
@ -21,4 +21,15 @@ test_expect_success 'checkout-index -h in broken repository' '
|
||||||
test_i18ngrep "[Uu]sage" broken/usage
|
test_i18ngrep "[Uu]sage" broken/usage
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'checkout-index reports errors (cmdline)' '
|
||||||
|
test_must_fail git checkout-index -- does-not-exist 2>stderr &&
|
||||||
|
test_i18ngrep not.in.the.cache stderr
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'checkout-index reports errors (stdin)' '
|
||||||
|
echo does-not-exist |
|
||||||
|
test_must_fail git checkout-index --stdin 2>stderr &&
|
||||||
|
test_i18ngrep not.in.the.cache stderr
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue