unpack-trees: fix English grammar in do-this-before-that messages
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alex Henrie committed
Jun 25, 2016 at 00:34 UTC
c2691e2add93453cfbcfe11ffcf2880d107d67f8
4 files changed
+16
-16
t/t1011-read-tree-sparse-checkout.sh
+1
-1
@@ -244,7 +244,7 @@ test_expect_success 'print errors when failed to update worktree' '
244
error: The following untracked working tree files would be overwritten by checkout:
245
sub/added
246
sub/addedtoo
247
-Please move or remove them before you can switch branches.
247
+Please move or remove them before you switch branches.
248
Aborting
249
EOF
250
test_cmp expected actual
t/t7607-merge-overwrite.sh
+1
-1
@@ -115,7 +115,7 @@ cat >expect <<\EOF
115
error: The following untracked working tree files would be overwritten by merge:
116
sub
117
sub2
118
-Please move or remove them before you can merge.
118
+Please move or remove them before you merge.
119
Aborting
120
EOF
121
t/t7609-merge-co-error-msgs.sh
+5
-5
@@ -31,7 +31,7 @@ error: The following untracked working tree files would be overwritten by merge:
31
four
32
three
33
two
34
-Please move or remove them before you can merge.
34
+Please move or remove them before you merge.
35
Aborting
36
EOF
37
@@ -53,10 +53,10 @@ error: Your local changes to the following files would be overwritten by merge:
53
four
54
three
55
two
56
-Please commit your changes or stash them before you can merge.
56
+Please commit your changes or stash them before you merge.
57
error: The following untracked working tree files would be overwritten by merge:
58
five
59
-Please move or remove them before you can merge.
59
+Please move or remove them before you merge.
60
Aborting
61
EOF
62
@@ -72,7 +72,7 @@ cat >expect <<\EOF
72
error: Your local changes to the following files would be overwritten by checkout:
73
rep/one
74
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.
76
Aborting
77
EOF
78
@@ -94,7 +94,7 @@ cat >expect <<\EOF
94
error: Your local changes to the following files would be overwritten by checkout:
95
rep/one
96
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.
98
Aborting
99
EOF
100
unpack-trees.c
+9
-9
@@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
62
if (!strcmp(cmd, "checkout"))
63
msg = advice_commit_before_merge
64
? _("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.")
66
: _("Your local changes to the following files would be overwritten by checkout:\n%%s");
67
else if (!strcmp(cmd, "merge"))
68
msg = advice_commit_before_merge
69
? _("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.")
71
: _("Your local changes to the following files would be overwritten by merge:\n%%s");
72
else
73
msg = advice_commit_before_merge
74
? _("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.")
76
: _("Your local changes to the following files would be overwritten by %s:\n%%s");
77
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
78
xstrfmt(msg, cmd, cmd);
@@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
83
if (!strcmp(cmd, "checkout"))
84
msg = advice_commit_before_merge
85
? _("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.")
87
: _("The following untracked working tree files would be removed by checkout:\n%%s");
88
else if (!strcmp(cmd, "merge"))
89
msg = advice_commit_before_merge
90
? _("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.")
92
: _("The following untracked working tree files would be removed by merge:\n%%s");
93
else
94
msg = advice_commit_before_merge
95
? _("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.")
97
: _("The following untracked working tree files would be removed by %s:\n%%s");
98
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
99
100
if (!strcmp(cmd, "checkout"))
101
msg = advice_commit_before_merge
102
? _("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.")
104
: _("The following untracked working tree files would be overwritten by checkout:\n%%s");
105
else if (!strcmp(cmd, "merge"))
106
msg = advice_commit_before_merge
107
? _("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.")
109
: _("The following untracked working tree files would be overwritten by merge:\n%%s");
110
else
111
msg = advice_commit_before_merge
112
? _("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.")
114
: _("The following untracked working tree files would be overwritten by %s:\n%%s");
115
msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);
116