12909b6b8a · matheusbsbs/matheus-bagliano

apply.c

+1 -1

@@ -133,7 +133,7 @@ int check_apply_state(struct apply_state *state, int force_apply)

133 int is_not_gitdir = !startup_info->have_repository;

134

135 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");

137 if (state->threeway) {

138 if (is_not_gitdir)

139 return error(_("--3way outside a repository"));

archive.c

+1 -1

@@ -581,7 +581,7 @@ static int parse_archive_args(int argc, const char **argv,

581 if (output)

582 die(_("Unexpected option --output"));

583 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");

585

586 if (!base)

587 base = "";

builtin/add.c

+4 -4

@@ -507,9 +507,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)

507 add_interactive = 1;

508 if (add_interactive) {

509 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");

511 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");

513 exit(interactive_add(argv + 1, prefix, patch_interactive));

514 }

515 if (legacy_stash_p) {

@@ -526,7 +526,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)

526

527 if (edit_interactive) {

528 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");

530 return(edit_patch(argc, argv, prefix));

531 }

532 argc--;

@@ -538,7 +538,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)

538 addremove = 0; /* "-u" was given but not "-A" */

539

540 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");

542

543 if (!show_only && ignore_missing)

544 die(_("Option --ignore-missing can only be used together with --dry-run"));

builtin/branch.c

+1 -1

@@ -722,7 +722,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)

722 finalize_colopts(&colopts, -1);

723 if (filter.verbose) {

724 if (explicitly_enable_column(colopts))

725 - die(_("--column and --verbose are incompatible"));

725 + die(_("options '%s' and '%s' cannot be used together"), "--column", "--verbose");

726 colopts = 0;

727 }

728

builtin/checkout.c

+4 -4

@@ -464,10 +464,10 @@ static int checkout_paths(const struct checkout_opts *opts,

464 die(_("'%s' cannot be used with updating paths"), "--detach");

465

466 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");

468

469 if (opts->ignore_unmerged && opts->merge)

470 - die(_("'%s' cannot be used with %s"),

470 + die(_("options '%s' and '%s' cannot be used together"),

471 opts->ignore_unmerged_opt, "-m");

472

473 if (opts->new_branch)

@@ -1749,10 +1749,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix,

1749 die(_("--pathspec-from-file is incompatible with pathspec arguments"));

1750

1751 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");

1753

1754 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");

1756

1757 parse_pathspec_file(&opts->pathspec, 0,

1758 0,

builtin/clone.c

+1 -1

@@ -903,7 +903,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)

903 die(_("--bare and --origin %s options are incompatible."),

904 option_origin);

905 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");

907 option_no_checkout = 1;

908 }

909

builtin/commit.c

+3 -3

@@ -355,10 +355,10 @@ static const char *prepare_index(const char **argv, const char *prefix,

355

356 if (pathspec_from_file) {

357 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");

359

360 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");

362

363 if (pathspec.nr)

364 die(_("--pathspec-from-file is incompatible with pathspec arguments"));

@@ -1193,7 +1193,7 @@ static void finalize_deferred_config(struct wt_status *s)

1193 status_format == STATUS_FORMAT_UNSPECIFIED)

1194 status_format = STATUS_FORMAT_PORCELAIN;

1195 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");

1197 }

1198

1199 if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED)

builtin/describe.c

+1 -1

@@ -590,7 +590,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)

590 save_commit_buffer = 0;

591

592 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");

594

595 if (contains) {

596 struct string_list_item *item;

builtin/difftool.c

+1 -1

@@ -730,7 +730,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)

730 setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);

731 setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);

732 } 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");

734

735 if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)

736 die(_("options '%s', '%s', and '%s' cannot be used together"), "--gui", "--tool", "--extcmd");

builtin/fast-export.c

+1 -1

@@ -1269,7 +1269,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)

1269 printf("feature done\n");

1270

1271 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");

1273 if (import_filename)

1274 import_marks(import_filename, 0);

1275 else if (import_filename_if_exists)

builtin/index-pack.c

+1 -1

@@ -1849,7 +1849,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)

1849 if (from_stdin && !startup_info->have_repository)

1850 die(_("--stdin requires a git repository"));

1851 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");

1853 if (!index_name && pack_name)

1854 index_name = derive_filename(pack_name, "pack", "idx", &index_name_buf);

1855

builtin/ls-files.c

+1 -1

@@ -767,7 +767,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)

767 * would not make any sense with this option.

768 */

769 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");

771 overlay_tree_on_index(the_repository->index, with_tree, max_prefix);

772 }

773

builtin/merge.c

+2 -2

@@ -1396,9 +1396,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)

1396

1397 if (squash) {

1398 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.");

1400 if (option_commit > 0)

1401 - die(_("You cannot combine --squash with --commit."));

1401 + die(_("options '%s' and '%s' cannot be used together"), "--squash", "--commit.");

1402 /*

1403 * squash can now silently disable option_commit - this is not

1404 * a problem as it is only overriding the default, not a user

builtin/pack-objects.c

+1 -1

@@ -4070,7 +4070,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)

4070 die(_("--thin cannot be used to build an indexable pack"));

4071

4072 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");

4074 if (!rev_list_all || !rev_list_reflog || !rev_list_index)

4075 unpack_unreachable_expiration = 0;

4076

builtin/push.c

+4 -4

@@ -589,7 +589,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)

589 set_push_cert_flags(&flags, push_cert);

590

591 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");

593 if (deleterefs && argc < 2)

594 die(_("--delete doesn't make sense without any refs"));

595

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

627

628 if (flags & TRANSPORT_PUSH_ALL) {

629 if (tags)

630 - die(_("--all and --tags are incompatible"));

630 + die(_("options '%s' and '%s' cannot be used together"), "--all", "--tags");

631 if (argc >= 2)

632 die(_("--all can't be combined with refspecs"));

633 }

634 if (flags & TRANSPORT_PUSH_MIRROR) {

635 if (tags)

636 - die(_("--mirror and --tags are incompatible"));

636 + die(_("options '%s' and '%s' cannot be used together"), "--mirror", "--tags");

637 if (argc >= 2)

638 die(_("--mirror can't be combined with refspecs"));

639 }

640 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");

642

643 if (!is_empty_cas(&cas) && (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES))

644 cas.use_force_if_includes = 1;

builtin/rebase.c

+3 -3

@@ -1190,13 +1190,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)

1190

1191 if (keep_base) {

1192 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");

1194 if (options.root)

1195 - die(_("cannot combine '--keep-base' with '--root'"));

1195 + die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--root");

1196 }

1197

1198 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");

1200

1201 if (action != ACTION_NONE && !in_progress)

1202 die(_("No rebase in progress?"));

builtin/repack.c

+2 -2

@@ -681,7 +681,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

681

682 if (keep_unreachable &&

683 (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");

685

686 if (write_bitmaps < 0) {

687 if (!write_midx &&

@@ -712,7 +712,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

712

713 if (geometric_factor) {

714 if (pack_everything)

715 - die(_("--geometric is incompatible with -A, -a"));

715 + die(_("options '%s' and '%s' cannot be used together"), "--geometric", "-A/-a");

716 init_pack_geometry(&geometry);

717 split_pack_geometry(geometry, geometric_factor);

718 }

builtin/reset.c

+2 -2

@@ -423,7 +423,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)

423

424 if (pathspec_from_file) {

425 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");

427

428 if (pathspec.nr)

429 die(_("--pathspec-from-file is incompatible with pathspec arguments"));

@@ -459,7 +459,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)

459

460 if (patch_mode) {

461 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}");

463 trace2_cmd_mode("patch-interactive");

464 return run_add_interactive(rev, "--patch=reset", &pathspec);

465 }

builtin/rev-list.c

+1 -1

@@ -538,7 +538,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)

538 const char *arg = argv[i];

539 if (skip_prefix(arg, "--missing=", &arg)) {

540 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");

542 if (parse_missing_action_value(arg))

543 break;

544 }

builtin/show-branch.c

+2 -2

@@ -707,8 +707,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)

707 *

708 * Also --all and --remotes do not make sense either.

709 */

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");

712 }

713

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

builtin/stash.c

+2 -2

@@ -1700,10 +1700,10 @@ static int push_stash(int argc, const char **argv, const char *prefix,

1700

1701 if (pathspec_from_file) {

1702 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");

1704

1705 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");

1707

1708 if (ps.nr)

1709 die(_("--pathspec-from-file is incompatible with pathspec arguments"));

builtin/tag.c

+2 -2

@@ -522,7 +522,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)

522 finalize_colopts(&colopts, -1);

523 if (cmdmode == 'l' && filter.lines != -1) {

524 if (explicitly_enable_column(colopts))

525 - die(_("--column and -n are incompatible"));

525 + die(_("options '%s' and '%s' cannot be used together"), "--column", "-n");

526 colopts = 0;

527 }

528 sorting = ref_sorting_options(&sorting_options);

@@ -564,7 +564,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)

564

565 if (msg.given || msgfile) {

566 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");

568 if (msg.given)

569 strbuf_addbuf(&buf, &(msg.buf));

570 else {

revision.c

+10 -10

@@ -2300,11 +2300,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg

2300 revs->left_only = 1;

2301 } else if (!strcmp(arg, "--right-only")) {

2302 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");

2304 revs->right_only = 1;

2305 } else if (!strcmp(arg, "--cherry")) {

2306 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");

2308 revs->cherry_mark = 1;

2309 revs->right_only = 1;

2310 revs->max_parents = 1;

@@ -2313,12 +2313,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg

2313 revs->count = 1;

2314 } else if (!strcmp(arg, "--cherry-mark")) {

2315 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");

2317 revs->cherry_mark = 1;

2318 revs->limited = 1; /* needs limit_list() */

2319 } else if (!strcmp(arg, "--cherry-pick")) {

2320 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");

2322 revs->cherry_pick = 1;

2323 revs->limited = 1;

2324 } else if (!strcmp(arg, "--objects")) {

@@ -2524,7 +2524,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg

2524 return opts;

2525 }

2526 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");

2528

2529 return 1;

2530 }

@@ -2867,22 +2867,22 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s

2867 compile_grep_patterns(&revs->grep_filter);

2868

2869 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");

2871 if (revs->reflog_info && revs->limited)

2872 die("cannot combine --walk-reflogs with history-limiting options");

2873 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");

2875

2876 /*

2877 * Limitations on the graph functionality

2878 */

2879 if (revs->reverse && revs->graph)

2880 - die("cannot combine --reverse with --graph");

2880 + die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--graph");

2881

2882 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");

2884 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");

2886 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)

2887 die("cannot use --grep-reflog without --walk-reflogs");

2888

t/t2026-checkout-pathspec-file.sh

+2 -2

@@ -149,10 +149,10 @@ test_expect_success 'error conditions' '

149 echo fileA.t >list &&

150

151 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 &&

153

154 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 &&

156

157 test_must_fail git checkout --pathspec-from-file=list -- fileA.t 2>err &&

158 test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&

t/t2072-restore-pathspec-file.sh

+1 -1

@@ -152,7 +152,7 @@ test_expect_success 'error conditions' '

152 >empty_list &&

153

154 test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 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 &&

156

157 test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&

158 test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&

t/t3431-rebase-fork-point.sh

+1 -1

@@ -83,7 +83,7 @@ test_expect_success 'git rebase --fork-point with ambigous refname' '

83

84 test_expect_success '--fork-point and --root both given' '

85 test_must_fail git rebase --fork-point --root 2>err &&

86 - test_i18ngrep "cannot combine" err

86 + test_i18ngrep "cannot be used together" err

87 '

88

89 test_expect_success 'rebase.forkPoint set to false' '

t/t3704-add-pathspec-file.sh

+3 -3

@@ -138,13 +138,13 @@ test_expect_success 'error conditions' '

138 >empty_list &&

139

140 test_must_fail git add --pathspec-from-file=list --interactive 2>err &&

141 - test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&

141 + test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&

142

143 test_must_fail git add --pathspec-from-file=list --patch 2>err &&

144 - test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&

144 + test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&

145

146 test_must_fail git add --pathspec-from-file=list --edit 2>err &&

147 - test_i18ngrep -e "--pathspec-from-file is incompatible with --edit" err &&

147 + test_i18ngrep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&

148

149 test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&

150 test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&

t/t3909-stash-pathspec-file.sh

+1 -1

@@ -88,7 +88,7 @@ test_expect_success 'error conditions' '

88 echo fileA.t >list &&

89

90 test_must_fail git stash push --pathspec-from-file=list --patch 2>err &&

91 - test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&

91 + test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&

92

93 test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err &&

94 test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&

t/t5606-clone-options.sh

+1 -1

@@ -54,7 +54,7 @@ test_expect_success 'disallows --bare with --separate-git-dir' '

54

55 test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&

56 test_debug "cat err" &&

57 - test_i18ngrep -e "--bare and --separate-git-dir are incompatible" err

57 + test_i18ngrep -e "options .--bare. and .--separate-git-dir. cannot be used together" err

58

59 '

60

t/t7107-reset-pathspec-file.sh

+1 -1

@@ -160,7 +160,7 @@ test_expect_success 'error conditions' '

160 git rm fileA.t &&

161

162 test_must_fail git reset --pathspec-from-file=list --patch 2>err &&

163 - test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&

163 + test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&

164

165 test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&

166 test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&

t/t7526-commit-pathspec-file.sh

+3 -3

@@ -141,13 +141,13 @@ test_expect_success 'error conditions' '

141 >empty_list &&

142

143 test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&

144 - test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&

144 + test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&

145

146 test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&

147 - test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&

147 + test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&

148

149 test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&

150 - test_i18ngrep -e "--pathspec-from-file with -a does not make sense" err &&

150 + test_i18ngrep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&

151

152 test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&

153 test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&

i18n: turn "options are incompatible" into "cannot be used together"