Skip to content

Commit 12909b6

Browse files
jnavilagitster
jnavila
authored and
gitster
committed
i18n: turn "options are incompatible" into "cannot be used together"
Signed-off-by: Jean-Noël Avila <[email protected]> Reviewed-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c488182 commit 12909b6

31 files changed

+64
-64
lines changed

‎apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ int check_apply_state(struct apply_state *state, int force_apply)
133133
int is_not_gitdir = !startup_info->have_repository;
134134

135135
if (state->apply_with_reject && state->threeway)
136-
return error(_("--reject and --3way cannot be used together."));
136+
return error(_("options '%s' and '%s' cannot be used together"), "--reject", "--3way");
137137
if (state->threeway) {
138138
if (is_not_gitdir)
139139
return error(_("--3way outside a repository"));

‎archive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ static int parse_archive_args(int argc, const char **argv,
581581
if (output)
582582
die(_("Unexpected option --output"));
583583
if (is_remote && args->extra_files.nr)
584-
die(_("Options --add-file and --remote cannot be used together"));
584+
die(_("options '%s' and '%s' cannot be used together"), "--add-file", "--remote");
585585

586586
if (!base)
587587
base = "";

‎builtin/add.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,9 +507,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
507507
add_interactive = 1;
508508
if (add_interactive) {
509509
if (show_only)
510-
die(_("--dry-run is incompatible with --interactive/--patch"));
510+
die(_("options '%s' and '%s' cannot be used together"), "--dry-run", "--interactive/--patch");
511511
if (pathspec_from_file)
512-
die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
512+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
513513
exit(interactive_add(argv + 1, prefix, patch_interactive));
514514
}
515515
if (legacy_stash_p) {
@@ -526,7 +526,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
526526

527527
if (edit_interactive) {
528528
if (pathspec_from_file)
529-
die(_("--pathspec-from-file is incompatible with --edit"));
529+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--edit");
530530
return(edit_patch(argc, argv, prefix));
531531
}
532532
argc--;
@@ -538,7 +538,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
538538
addremove = 0; /* "-u" was given but not "-A" */
539539

540540
if (addremove && take_worktree_changes)
541-
die(_("-A and -u are mutually incompatible"));
541+
die(_("options '%s' and '%s' cannot be used together"), "-A", "-u");
542542

543543
if (!show_only && ignore_missing)
544544
die(_("Option --ignore-missing can only be used together with --dry-run"));

‎builtin/branch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
722722
finalize_colopts(&colopts, -1);
723723
if (filter.verbose) {
724724
if (explicitly_enable_column(colopts))
725-
die(_("--column and --verbose are incompatible"));
725+
die(_("options '%s' and '%s' cannot be used together"), "--column", "--verbose");
726726
colopts = 0;
727727
}
728728

‎builtin/checkout.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,10 +464,10 @@ static int checkout_paths(const struct checkout_opts *opts,
464464
die(_("'%s' cannot be used with updating paths"), "--detach");
465465

466466
if (opts->merge && opts->patch_mode)
467-
die(_("'%s' cannot be used with %s"), "--merge", "--patch");
467+
die(_("options '%s' and '%s' cannot be used together"), "--merge", "--patch");
468468

469469
if (opts->ignore_unmerged && opts->merge)
470-
die(_("'%s' cannot be used with %s"),
470+
die(_("options '%s' and '%s' cannot be used together"),
471471
opts->ignore_unmerged_opt, "-m");
472472

473473
if (opts->new_branch)
@@ -1749,10 +1749,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
17491749
die(_("--pathspec-from-file is incompatible with pathspec arguments"));
17501750

17511751
if (opts->force_detach)
1752-
die(_("--pathspec-from-file is incompatible with --detach"));
1752+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--detach");
17531753

17541754
if (opts->patch_mode)
1755-
die(_("--pathspec-from-file is incompatible with --patch"));
1755+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
17561756

17571757
parse_pathspec_file(&opts->pathspec, 0,
17581758
0,

‎builtin/clone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
903903
die(_("--bare and --origin %s options are incompatible."),
904904
option_origin);
905905
if (real_git_dir)
906-
die(_("--bare and --separate-git-dir are incompatible."));
906+
die(_("options '%s' and '%s' cannot be used together"), "--bare", "--separate-git-dir");
907907
option_no_checkout = 1;
908908
}
909909

‎builtin/commit.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,10 @@ static const char *prepare_index(const char **argv, const char *prefix,
355355

356356
if (pathspec_from_file) {
357357
if (interactive)
358-
die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
358+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
359359

360360
if (all)
361-
die(_("--pathspec-from-file with -a does not make sense"));
361+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "-a");
362362

363363
if (pathspec.nr)
364364
die(_("--pathspec-from-file is incompatible with pathspec arguments"));
@@ -1193,7 +1193,7 @@ static void finalize_deferred_config(struct wt_status *s)
11931193
status_format == STATUS_FORMAT_UNSPECIFIED)
11941194
status_format = STATUS_FORMAT_PORCELAIN;
11951195
else if (status_format == STATUS_FORMAT_LONG)
1196-
die(_("--long and -z are incompatible"));
1196+
die(_("options '%s' and '%s' cannot be used together"), "--long", "-z");
11971197
}
11981198

11991199
if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED)

‎builtin/describe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
590590
save_commit_buffer = 0;
591591

592592
if (longformat && abbrev == 0)
593-
die(_("--long is incompatible with --abbrev=0"));
593+
die(_("options '%s' and '%s' cannot be used together"), "--long", "--abbrev=0");
594594

595595
if (contains) {
596596
struct string_list_item *item;

‎builtin/difftool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
730730
setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);
731731
setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);
732732
} else if (dir_diff)
733-
die(_("--dir-diff is incompatible with --no-index"));
733+
die(_("options '%s' and '%s' cannot be used together"), "--dir-diff", "--no-index");
734734

735735
if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
736736
die(_("options '%s', '%s', and '%s' cannot be used together"), "--gui", "--tool", "--extcmd");

‎builtin/fast-export.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
12691269
printf("feature done\n");
12701270

12711271
if (import_filename && import_filename_if_exists)
1272-
die(_("Cannot pass both --import-marks and --import-marks-if-exists"));
1272+
die(_("options '%s' and '%s' cannot be used together"), "--import-marks", "--import-marks-if-exists");
12731273
if (import_filename)
12741274
import_marks(import_filename, 0);
12751275
else if (import_filename_if_exists)

‎builtin/index-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1849,7 +1849,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
18491849
if (from_stdin && !startup_info->have_repository)
18501850
die(_("--stdin requires a git repository"));
18511851
if (from_stdin && hash_algo)
1852-
die(_("--object-format cannot be used with --stdin"));
1852+
die(_("options '%s' and '%s' cannot be used together"), "--object-format", "--stdin");
18531853
if (!index_name && pack_name)
18541854
index_name = derive_filename(pack_name, "pack", "idx", &index_name_buf);
18551855

‎builtin/ls-files.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
767767
* would not make any sense with this option.
768768
*/
769769
if (show_stage || show_unmerged)
770-
die("ls-files --with-tree is incompatible with -s or -u");
770+
die(_("options '%s' and '%s' cannot be used together"), "ls-files --with-tree", "-s/-u");
771771
overlay_tree_on_index(the_repository->index, with_tree, max_prefix);
772772
}
773773

‎builtin/merge.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,9 +1396,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
13961396

13971397
if (squash) {
13981398
if (fast_forward == FF_NO)
1399-
die(_("You cannot combine --squash with --no-ff."));
1399+
die(_("options '%s' and '%s' cannot be used together"), "--squash", "--no-ff.");
14001400
if (option_commit > 0)
1401-
die(_("You cannot combine --squash with --commit."));
1401+
die(_("options '%s' and '%s' cannot be used together"), "--squash", "--commit.");
14021402
/*
14031403
* squash can now silently disable option_commit - this is not
14041404
* a problem as it is only overriding the default, not a user

‎builtin/pack-objects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4070,7 +4070,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
40704070
die(_("--thin cannot be used to build an indexable pack"));
40714071

40724072
if (keep_unreachable && unpack_unreachable)
4073-
die(_("--keep-unreachable and --unpack-unreachable are incompatible"));
4073+
die(_("options '%s' and '%s' cannot be used together"), "--keep-unreachable", "--unpack-unreachable");
40744074
if (!rev_list_all || !rev_list_reflog || !rev_list_index)
40754075
unpack_unreachable_expiration = 0;
40764076

‎builtin/push.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
589589
set_push_cert_flags(&flags, push_cert);
590590

591591
if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
592-
die(_("--delete is incompatible with --all, --mirror and --tags"));
592+
die(_("options '%s' and '%s' cannot be used together"), "--delete", "--all/--mirror/--tags");
593593
if (deleterefs && argc < 2)
594594
die(_("--delete doesn't make sense without any refs"));
595595

@@ -627,18 +627,18 @@ int cmd_push(int argc, const char **argv, const char *prefix)
627627

628628
if (flags & TRANSPORT_PUSH_ALL) {
629629
if (tags)
630-
die(_("--all and --tags are incompatible"));
630+
die(_("options '%s' and '%s' cannot be used together"), "--all", "--tags");
631631
if (argc >= 2)
632632
die(_("--all can't be combined with refspecs"));
633633
}
634634
if (flags & TRANSPORT_PUSH_MIRROR) {
635635
if (tags)
636-
die(_("--mirror and --tags are incompatible"));
636+
die(_("options '%s' and '%s' cannot be used together"), "--mirror", "--tags");
637637
if (argc >= 2)
638638
die(_("--mirror can't be combined with refspecs"));
639639
}
640640
if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
641-
die(_("--all and --mirror are incompatible"));
641+
die(_("options '%s' and '%s' cannot be used together"), "--all", "--mirror");
642642

643643
if (!is_empty_cas(&cas) && (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES))
644644
cas.use_force_if_includes = 1;

‎builtin/rebase.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,13 +1190,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
11901190

11911191
if (keep_base) {
11921192
if (options.onto_name)
1193-
die(_("cannot combine '--keep-base' with '--onto'"));
1193+
die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--onto");
11941194
if (options.root)
1195-
die(_("cannot combine '--keep-base' with '--root'"));
1195+
die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--root");
11961196
}
11971197

11981198
if (options.root && options.fork_point > 0)
1199-
die(_("cannot combine '--root' with '--fork-point'"));
1199+
die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
12001200

12011201
if (action != ACTION_NONE && !in_progress)
12021202
die(_("No rebase in progress?"));

‎builtin/repack.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
681681

682682
if (keep_unreachable &&
683683
(unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
684-
die(_("--keep-unreachable and -A are incompatible"));
684+
die(_("options '%s' and '%s' cannot be used together"), "--keep-unreachable", "-A");
685685

686686
if (write_bitmaps < 0) {
687687
if (!write_midx &&
@@ -712,7 +712,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
712712

713713
if (geometric_factor) {
714714
if (pack_everything)
715-
die(_("--geometric is incompatible with -A, -a"));
715+
die(_("options '%s' and '%s' cannot be used together"), "--geometric", "-A/-a");
716716
init_pack_geometry(&geometry);
717717
split_pack_geometry(geometry, geometric_factor);
718718
}

‎builtin/reset.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
423423

424424
if (pathspec_from_file) {
425425
if (patch_mode)
426-
die(_("--pathspec-from-file is incompatible with --patch"));
426+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
427427

428428
if (pathspec.nr)
429429
die(_("--pathspec-from-file is incompatible with pathspec arguments"));
@@ -459,7 +459,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
459459

460460
if (patch_mode) {
461461
if (reset_type != NONE)
462-
die(_("--patch is incompatible with --{hard,mixed,soft}"));
462+
die(_("options '%s' and '%s' cannot be used together"), "--patch", "--{hard,mixed,soft}");
463463
trace2_cmd_mode("patch-interactive");
464464
return run_add_interactive(rev, "--patch=reset", &pathspec);
465465
}

‎builtin/rev-list.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
538538
const char *arg = argv[i];
539539
if (skip_prefix(arg, "--missing=", &arg)) {
540540
if (revs.exclude_promisor_objects)
541-
die(_("cannot combine --exclude-promisor-objects and --missing"));
541+
die(_("options '%s' and '%s' cannot be used together"), "--exclude-promisor-objects", "--missing");
542542
if (parse_missing_action_value(arg))
543543
break;
544544
}

‎builtin/show-branch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,8 +707,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
707707
*
708708
* Also --all and --remotes do not make sense either.
709709
*/
710-
die(_("--reflog is incompatible with --all, --remotes, "
711-
"--independent or --merge-base"));
710+
die(_("options '%s' and '%s' cannot be used together"), "--reflog",
711+
"--all/--remotes/--independent/--merge-base");
712712
}
713713

714714
/* If nothing is specified, show all branches by default */

‎builtin/stash.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,10 +1700,10 @@ static int push_stash(int argc, const char **argv, const char *prefix,
17001700

17011701
if (pathspec_from_file) {
17021702
if (patch_mode)
1703-
die(_("--pathspec-from-file is incompatible with --patch"));
1703+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
17041704

17051705
if (only_staged)
1706-
die(_("--pathspec-from-file is incompatible with --staged"));
1706+
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--staged");
17071707

17081708
if (ps.nr)
17091709
die(_("--pathspec-from-file is incompatible with pathspec arguments"));

‎builtin/tag.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
522522
finalize_colopts(&colopts, -1);
523523
if (cmdmode == 'l' && filter.lines != -1) {
524524
if (explicitly_enable_column(colopts))
525-
die(_("--column and -n are incompatible"));
525+
die(_("options '%s' and '%s' cannot be used together"), "--column", "-n");
526526
colopts = 0;
527527
}
528528
sorting = ref_sorting_options(&sorting_options);
@@ -564,7 +564,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
564564

565565
if (msg.given || msgfile) {
566566
if (msg.given && msgfile)
567-
die(_("only one -F or -m option is allowed."));
567+
die(_("options '%s' and '%s' cannot be used together"), "-F", "-m");
568568
if (msg.given)
569569
strbuf_addbuf(&buf, &(msg.buf));
570570
else {

‎revision.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,11 +2300,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
23002300
revs->left_only = 1;
23012301
} else if (!strcmp(arg, "--right-only")) {
23022302
if (revs->left_only)
2303-
die("--right-only is incompatible with --left-only");
2303+
die(_("options '%s' and '%s' cannot be used together"), "--right-only", "--left-only");
23042304
revs->right_only = 1;
23052305
} else if (!strcmp(arg, "--cherry")) {
23062306
if (revs->left_only)
2307-
die("--cherry is incompatible with --left-only");
2307+
die(_("options '%s' and '%s' cannot be used together"), "--cherry", "--left-only");
23082308
revs->cherry_mark = 1;
23092309
revs->right_only = 1;
23102310
revs->max_parents = 1;
@@ -2313,12 +2313,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
23132313
revs->count = 1;
23142314
} else if (!strcmp(arg, "--cherry-mark")) {
23152315
if (revs->cherry_pick)
2316-
die("--cherry-mark is incompatible with --cherry-pick");
2316+
die(_("options '%s' and '%s' cannot be used together"), "--cherry-mark", "--cherry-pick");
23172317
revs->cherry_mark = 1;
23182318
revs->limited = 1; /* needs limit_list() */
23192319
} else if (!strcmp(arg, "--cherry-pick")) {
23202320
if (revs->cherry_mark)
2321-
die("--cherry-pick is incompatible with --cherry-mark");
2321+
die(_("options '%s' and '%s' cannot be used together"), "--cherry-pick", "--cherry-mark");
23222322
revs->cherry_pick = 1;
23232323
revs->limited = 1;
23242324
} else if (!strcmp(arg, "--objects")) {
@@ -2524,7 +2524,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
25242524
return opts;
25252525
}
25262526
if (revs->graph && revs->track_linear)
2527-
die("--show-linear-break and --graph are incompatible");
2527+
die(_("options '%s' and '%s' cannot be used together"), "--show-linear-break", "--graph");
25282528

25292529
return 1;
25302530
}
@@ -2867,22 +2867,22 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
28672867
compile_grep_patterns(&revs->grep_filter);
28682868

28692869
if (revs->reverse && revs->reflog_info)
2870-
die("cannot combine --reverse with --walk-reflogs");
2870+
die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--walk-reflogs");
28712871
if (revs->reflog_info && revs->limited)
28722872
die("cannot combine --walk-reflogs with history-limiting options");
28732873
if (revs->rewrite_parents && revs->children.name)
2874-
die("cannot combine --parents and --children");
2874+
die(_("options '%s' and '%s' cannot be used together"), "--parents", "--children");
28752875

28762876
/*
28772877
* Limitations on the graph functionality
28782878
*/
28792879
if (revs->reverse && revs->graph)
2880-
die("cannot combine --reverse with --graph");
2880+
die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--graph");
28812881

28822882
if (revs->reflog_info && revs->graph)
2883-
die("cannot combine --walk-reflogs with --graph");
2883+
die(_("options '%s' and '%s' cannot be used together"), "--walk-reflogs", "--graph");
28842884
if (revs->no_walk && revs->graph)
2885-
die("cannot combine --no-walk with --graph");
2885+
die(_("options '%s' and '%s' cannot be used together"), "--no-walk", "--graph");
28862886
if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
28872887
die("cannot use --grep-reflog without --walk-reflogs");
28882888

‎t/t2026-checkout-pathspec-file.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ test_expect_success 'error conditions' '
149149
echo fileA.t >list &&
150150
151151
test_must_fail git checkout --pathspec-from-file=list --detach 2>err &&
152-
test_i18ngrep -e "--pathspec-from-file is incompatible with --detach" err &&
152+
test_i18ngrep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err &&
153153
154154
test_must_fail git checkout --pathspec-from-file=list --patch 2>err &&
155-
test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
155+
test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
156156
157157
test_must_fail git checkout --pathspec-from-file=list -- fileA.t 2>err &&
158158
test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&

0 commit comments

Comments
 (0)