Skip to content

Commit 67166a8

Browse files
gitstergitster
committed
Merge branch 'ah/unpack-trees-advice-messages'
Grammofix. * ah/unpack-trees-advice-messages: unpack-trees: fix English grammar in do-this-before-that messages
2 parents 2703572 + c2691e2 commit 67166a8

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎t/t1011-read-tree-sparse-checkout.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ test_expect_success 'print errors when failed to update worktree' '
244244
error: The following untracked working tree files would be overwritten by checkout:
245245
sub/added
246246
sub/addedtoo
247-
Please move or remove them before you can switch branches.
247+
Please move or remove them before you switch branches.
248248
Aborting
249249
EOF
250250
test_i18ncmp expected actual

‎t/t7607-merge-overwrite.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ cat >expect <<\EOF
115115
error: The following untracked working tree files would be overwritten by merge:
116116
sub
117117
sub2
118-
Please move or remove them before you can merge.
118+
Please move or remove them before you merge.
119119
Aborting
120120
EOF
121121

‎t/t7609-merge-co-error-msgs.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ error: The following untracked working tree files would be overwritten by merge:
3131
four
3232
three
3333
two
34-
Please move or remove them before you can merge.
34+
Please move or remove them before you merge.
3535
Aborting
3636
EOF
3737

@@ -53,10 +53,10 @@ error: Your local changes to the following files would be overwritten by merge:
5353
four
5454
three
5555
two
56-
Please commit your changes or stash them before you can merge.
56+
Please commit your changes or stash them before you merge.
5757
error: The following untracked working tree files would be overwritten by merge:
5858
five
59-
Please move or remove them before you can merge.
59+
Please move or remove them before you merge.
6060
Aborting
6161
EOF
6262

@@ -72,7 +72,7 @@ cat >expect <<\EOF
7272
error: Your local changes to the following files would be overwritten by checkout:
7373
rep/one
7474
rep/two
75-
Please commit your changes or stash them before you can switch branches.
75+
Please commit your changes or stash them before you switch branches.
7676
Aborting
7777
EOF
7878

@@ -94,7 +94,7 @@ cat >expect <<\EOF
9494
error: Your local changes to the following files would be overwritten by checkout:
9595
rep/one
9696
rep/two
97-
Please commit your changes or stash them before you can switch branches.
97+
Please commit your changes or stash them before you switch branches.
9898
Aborting
9999
EOF
100100

‎unpack-trees.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
6262
if (!strcmp(cmd, "checkout"))
6363
msg = advice_commit_before_merge
6464
? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
65-
"Please commit your changes or stash them before you can switch branches.")
65+
"Please commit your changes or stash them before you switch branches.")
6666
: _("Your local changes to the following files would be overwritten by checkout:\n%%s");
6767
else if (!strcmp(cmd, "merge"))
6868
msg = advice_commit_before_merge
6969
? _("Your local changes to the following files would be overwritten by merge:\n%%s"
70-
"Please commit your changes or stash them before you can merge.")
70+
"Please commit your changes or stash them before you merge.")
7171
: _("Your local changes to the following files would be overwritten by merge:\n%%s");
7272
else
7373
msg = advice_commit_before_merge
7474
? _("Your local changes to the following files would be overwritten by %s:\n%%s"
75-
"Please commit your changes or stash them before you can %s.")
75+
"Please commit your changes or stash them before you %s.")
7676
: _("Your local changes to the following files would be overwritten by %s:\n%%s");
7777
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
7878
xstrfmt(msg, cmd, cmd);
@@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
8383
if (!strcmp(cmd, "checkout"))
8484
msg = advice_commit_before_merge
8585
? _("The following untracked working tree files would be removed by checkout:\n%%s"
86-
"Please move or remove them before you can switch branches.")
86+
"Please move or remove them before you switch branches.")
8787
: _("The following untracked working tree files would be removed by checkout:\n%%s");
8888
else if (!strcmp(cmd, "merge"))
8989
msg = advice_commit_before_merge
9090
? _("The following untracked working tree files would be removed by merge:\n%%s"
91-
"Please move or remove them before you can merge.")
91+
"Please move or remove them before you merge.")
9292
: _("The following untracked working tree files would be removed by merge:\n%%s");
9393
else
9494
msg = advice_commit_before_merge
9595
? _("The following untracked working tree files would be removed by %s:\n%%s"
96-
"Please move or remove them before you can %s.")
96+
"Please move or remove them before you %s.")
9797
: _("The following untracked working tree files would be removed by %s:\n%%s");
9898
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
9999

100100
if (!strcmp(cmd, "checkout"))
101101
msg = advice_commit_before_merge
102102
? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
103-
"Please move or remove them before you can switch branches.")
103+
"Please move or remove them before you switch branches.")
104104
: _("The following untracked working tree files would be overwritten by checkout:\n%%s");
105105
else if (!strcmp(cmd, "merge"))
106106
msg = advice_commit_before_merge
107107
? _("The following untracked working tree files would be overwritten by merge:\n%%s"
108-
"Please move or remove them before you can merge.")
108+
"Please move or remove them before you merge.")
109109
: _("The following untracked working tree files would be overwritten by merge:\n%%s");
110110
else
111111
msg = advice_commit_before_merge
112112
? _("The following untracked working tree files would be overwritten by %s:\n%%s"
113-
"Please move or remove them before you can %s.")
113+
"Please move or remove them before you %s.")
114114
: _("The following untracked working tree files would be overwritten by %s:\n%%s");
115115
msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);
116116

0 commit comments

Comments
 (0)