restore: make pathspec mandatory
"git restore" without arguments does not make much sense when it's about restoring files (what files now?). We could default to either git restore . or git restore :/ Neither is intuitive. Make the user always give pathspec, force the user to think the scope of restore they want because this is a destructive operation. "git restore -p" without pathspec is an exception to this because it really is a separate mode. It will be treated as running patch mode on the whole worktree. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Apr 25, 2019 at 16:45 UTC
be8ed5022b84fa75c24f24bbf64bb5ad6652c64f
1 file changed
+7
builtin/checkout.c
+7
@@ -65,6 +65,7 @@ struct checkout_opts {
65
int only_merge_on_switching_branches;
66
int can_switch_when_in_progress;
67
int orphan_from_empty_tree;
68
+ int empty_pathspec_ok;
69
70
const char *new_branch;
71
const char *new_branch_force;
@@ -1515,6 +1516,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
1516
die(_("reference is not a tree: %s"), opts->from_treeish);
1517
}
1518
1519
+ if (opts->accept_pathspec && !opts->empty_pathspec_ok && !argc &&
1520
+ !opts->patch_mode) /* patch mode is special */
1521
+ die(_("you must specify path(s) to restore"));
1522
+
1523
if (argc) {
1524
parse_pathspec(&opts->pathspec, 0,
1525
opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
@@ -1601,6 +1606,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
1606
opts.implicit_detach = 1;
1607
opts.can_switch_when_in_progress = 1;
1608
opts.orphan_from_empty_tree = 0;
1609
+ opts.empty_pathspec_ok = 1;
1610
1611
options = parse_options_dup(checkout_options);
1612
options = add_common_options(&opts, options);
@@ -1664,6 +1670,7 @@ int cmd_restore(int argc, const char **argv, const char *prefix)
1670
memset(&opts, 0, sizeof(opts));
1671
opts.accept_ref = 0;
1672
opts.accept_pathspec = 1;
1673
+ opts.empty_pathspec_ok = 0;
1674
1675
options = parse_options_dup(restore_options);
1676
options = add_common_options(&opts, options);