undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/unpack-trees-advice-messages' into maint

Browse Source 
Grammofix.

* ah/unpack-trees-advice-messages:
  unpack-trees: fix English grammar in do-this-before-that messages
This commit is contained in:
Junio C Hamano 2016-08-08 14:21:40 -07:00
commit e69771c3af
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t1011-read-tree-sparse-checkout.sh
View File

@ -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: error: The following untracked working tree files would be overwritten by checkout:
sub/added sub/added
sub/addedtoo sub/addedtoo
Please move or remove them before you can switch branches. Please move or remove them before you switch branches.
Aborting Aborting
EOF EOF
test_cmp expected actual test_cmp expected actual

2
t/t7607-merge-overwrite.sh
View File

@ -115,7 +115,7 @@ cat >expect <<\EOF
error: The following untracked working tree files would be overwritten by merge: error: The following untracked working tree files would be overwritten by merge:
sub sub
sub2 sub2
Please move or remove them before you can merge. Please move or remove them before you merge.
Aborting Aborting
EOF EOF

10
t/t7609-merge-co-error-msgs.sh
View File

@ -31,7 +31,7 @@ error: The following untracked working tree files would be overwritten by merge:
four four
three three
two two
Please move or remove them before you can merge. Please move or remove them before you merge.
Aborting Aborting
EOF EOF
@ -53,10 +53,10 @@ error: Your local changes to the following files would be overwritten by merge:
four four
three three
two 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: error: The following untracked working tree files would be overwritten by merge:
five five
Please move or remove them before you can merge. Please move or remove them before you merge.
Aborting Aborting
EOF EOF
@ -72,7 +72,7 @@ cat >expect <<\EOF
error: Your local changes to the following files would be overwritten by checkout: error: Your local changes to the following files would be overwritten by checkout:
rep/one rep/one
rep/two 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 Aborting
EOF EOF
@ -94,7 +94,7 @@ cat >expect <<\EOF
error: Your local changes to the following files would be overwritten by checkout: error: Your local changes to the following files would be overwritten by checkout:
rep/one rep/one
rep/two 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 Aborting
EOF EOF

18
unpack-trees.c
View File

@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
if (!strcmp(cmd, "checkout")) if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("Your local changes to the following files would be overwritten by checkout:\n%%s" ? _("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"); : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge")) else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("Your local changes to the following files would be overwritten by merge:\n%%s" ? _("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"); : _("Your local changes to the following files would be overwritten by merge:\n%%s");
else else
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("Your local changes to the following files would be overwritten by %s:\n%%s" ? _("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"); : _("Your local changes to the following files would be overwritten by %s:\n%%s");
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
xstrfmt(msg, cmd, cmd); xstrfmt(msg, cmd, cmd);
@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
if (!strcmp(cmd, "checkout")) if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("The following untracked working tree files would be removed by checkout:\n%%s" ? _("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"); : _("The following untracked working tree files would be removed by checkout:\n%%s");
else if (!strcmp(cmd, "merge")) else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("The following untracked working tree files would be removed by merge:\n%%s" ? _("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"); : _("The following untracked working tree files would be removed by merge:\n%%s");
else else
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("The following untracked working tree files would be removed by %s:\n%%s" ? _("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"); : _("The following untracked working tree files would be removed by %s:\n%%s");
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd); msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
if (!strcmp(cmd, "checkout")) if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("The following untracked working tree files would be overwritten by checkout:\n%%s" ? _("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"); : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge")) else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("The following untracked working tree files would be overwritten by merge:\n%%s" ? _("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"); : _("The following untracked working tree files would be overwritten by merge:\n%%s");
else else
msg = advice_commit_before_merge msg = advice_commit_before_merge
? _("The following untracked working tree files would be overwritten by %s:\n%%s" ? _("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"); : _("The following untracked working tree files would be overwritten by %s:\n%%s");
msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd); msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);