summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-04-25 09:45:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-07 04:04:47 (GMT)
commite3ddd3b5e583e62d874f56f8c88603ad0ebafd5e (patch)
treebc9cfc25295e585703341f8237e3d48727e19862 /builtin/checkout.c
parent183fb44fd234499ed76d72d745ccb480b25f6d15 (diff)
downloadgit-e3ddd3b5e583e62d874f56f8c88603ad0ebafd5e.zip
git-e3ddd3b5e583e62d874f56f8c88603ad0ebafd5e.tar.gz
git-e3ddd3b5e583e62d874f56f8c88603ad0ebafd5e.tar.bz2
restore: reject invalid combinations with --staged
git-checkout rejects plenty of invalid option combinations. Since git-checkout is equivalent of either git restore --source --staged --worktree or git restore --worktree that still leaves the new mode 'git restore --index' unprotected. Reject some more invalid option combinations. The other new mode 'restore --source --worktree' does not need anything else. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index e855c64..71e2589 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -433,6 +433,16 @@ static int checkout_paths(const struct checkout_opts *opts,
die(_("'%s' must be used when '%s' is not specified"),
"--worktree", "--source");
+ if (opts->checkout_index && !opts->checkout_worktree &&
+ opts->writeout_stage)
+ die(_("'%s' or '%s' cannot be used with %s"),
+ "--ours", "--theirs", "--staged");
+
+ if (opts->checkout_index && !opts->checkout_worktree &&
+ opts->merge)
+ die(_("'%s' or '%s' cannot be used with %s"),
+ "--merge", "--conflict", "--staged");
+
if (opts->patch_mode) {
const char *patch_mode;