mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'ah/unpack-trees-advice-messages'
Grammofix. * ah/unpack-trees-advice-messages: unpack-trees: fix English grammar in do-this-before-that messages
This commit is contained in:
commit
67166a8da6
|
@ -244,7 +244,7 @@ test_expect_success 'print errors when failed to update worktree' '
|
|||
error: The following untracked working tree files would be overwritten by checkout:
|
||||
sub/added
|
||||
sub/addedtoo
|
||||
Please move or remove them before you can switch branches.
|
||||
Please move or remove them before you switch branches.
|
||||
Aborting
|
||||
EOF
|
||||
test_i18ncmp expected actual
|
||||
|
|
|
@ -115,7 +115,7 @@ cat >expect <<\EOF
|
|||
error: The following untracked working tree files would be overwritten by merge:
|
||||
sub
|
||||
sub2
|
||||
Please move or remove them before you can merge.
|
||||
Please move or remove them before you merge.
|
||||
Aborting
|
||||
EOF
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ error: The following untracked working tree files would be overwritten by merge:
|
|||
four
|
||||
three
|
||||
two
|
||||
Please move or remove them before you can merge.
|
||||
Please move or remove them before you merge.
|
||||
Aborting
|
||||
EOF
|
||||
|
||||
|
@ -53,10 +53,10 @@ error: Your local changes to the following files would be overwritten by merge:
|
|||
four
|
||||
three
|
||||
two
|
||||
Please commit your changes or stash them before you can merge.
|
||||
Please commit your changes or stash them before you merge.
|
||||
error: The following untracked working tree files would be overwritten by merge:
|
||||
five
|
||||
Please move or remove them before you can merge.
|
||||
Please move or remove them before you merge.
|
||||
Aborting
|
||||
EOF
|
||||
|
||||
|
@ -72,7 +72,7 @@ cat >expect <<\EOF
|
|||
error: Your local changes to the following files would be overwritten by checkout:
|
||||
rep/one
|
||||
rep/two
|
||||
Please commit your changes or stash them before you can switch branches.
|
||||
Please commit your changes or stash them before you switch branches.
|
||||
Aborting
|
||||
EOF
|
||||
|
||||
|
@ -94,7 +94,7 @@ cat >expect <<\EOF
|
|||
error: Your local changes to the following files would be overwritten by checkout:
|
||||
rep/one
|
||||
rep/two
|
||||
Please commit your changes or stash them before you can switch branches.
|
||||
Please commit your changes or stash them before you switch branches.
|
||||
Aborting
|
||||
EOF
|
||||
|
||||
|
|
|
@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
|
|||
if (!strcmp(cmd, "checkout"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
|
||||
"Please commit your changes or stash them before you can switch branches.")
|
||||
"Please commit your changes or stash them before you switch branches.")
|
||||
: _("Your local changes to the following files would be overwritten by checkout:\n%%s");
|
||||
else if (!strcmp(cmd, "merge"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("Your local changes to the following files would be overwritten by merge:\n%%s"
|
||||
"Please commit your changes or stash them before you can merge.")
|
||||
"Please commit your changes or stash them before you merge.")
|
||||
: _("Your local changes to the following files would be overwritten by merge:\n%%s");
|
||||
else
|
||||
msg = advice_commit_before_merge
|
||||
? _("Your local changes to the following files would be overwritten by %s:\n%%s"
|
||||
"Please commit your changes or stash them before you can %s.")
|
||||
"Please commit your changes or stash them before you %s.")
|
||||
: _("Your local changes to the following files would be overwritten by %s:\n%%s");
|
||||
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
|
||||
xstrfmt(msg, cmd, cmd);
|
||||
|
@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
|
|||
if (!strcmp(cmd, "checkout"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be removed by checkout:\n%%s"
|
||||
"Please move or remove them before you can switch branches.")
|
||||
"Please move or remove them before you switch branches.")
|
||||
: _("The following untracked working tree files would be removed by checkout:\n%%s");
|
||||
else if (!strcmp(cmd, "merge"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be removed by merge:\n%%s"
|
||||
"Please move or remove them before you can merge.")
|
||||
"Please move or remove them before you merge.")
|
||||
: _("The following untracked working tree files would be removed by merge:\n%%s");
|
||||
else
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be removed by %s:\n%%s"
|
||||
"Please move or remove them before you can %s.")
|
||||
"Please move or remove them before you %s.")
|
||||
: _("The following untracked working tree files would be removed by %s:\n%%s");
|
||||
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
|
||||
|
||||
if (!strcmp(cmd, "checkout"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
|
||||
"Please move or remove them before you can switch branches.")
|
||||
"Please move or remove them before you switch branches.")
|
||||
: _("The following untracked working tree files would be overwritten by checkout:\n%%s");
|
||||
else if (!strcmp(cmd, "merge"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be overwritten by merge:\n%%s"
|
||||
"Please move or remove them before you can merge.")
|
||||
"Please move or remove them before you merge.")
|
||||
: _("The following untracked working tree files would be overwritten by merge:\n%%s");
|
||||
else
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be overwritten by %s:\n%%s"
|
||||
"Please move or remove them before you can %s.")
|
||||
"Please move or remove them before you %s.")
|
||||
: _("The following untracked working tree files would be overwritten by %s:\n%%s");
|
||||
msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);
|
||||
|
||||
|
|
Loading…
Reference in a new issue