Merge branch 'sb/unpack-trees-grammofix' into maint
* sb/unpack-trees-grammofix: unpack-trees: fix grammar for untracked files in directories
This commit is contained in:
commit
1addc197eb
@ -105,7 +105,7 @@ test_expect_success 'not uptodate file porcelain checkout error' '
|
|||||||
'
|
'
|
||||||
|
|
||||||
cat >expect <<\EOF
|
cat >expect <<\EOF
|
||||||
error: Updating the following directories would lose untracked files in it:
|
error: Updating the following directories would lose untracked files in them:
|
||||||
rep
|
rep
|
||||||
rep2
|
rep2
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
|
|||||||
xstrfmt(msg, cmd, cmd);
|
xstrfmt(msg, cmd, cmd);
|
||||||
|
|
||||||
msgs[ERROR_NOT_UPTODATE_DIR] =
|
msgs[ERROR_NOT_UPTODATE_DIR] =
|
||||||
_("Updating the following directories would lose untracked files in it:\n%s");
|
_("Updating the following directories would lose untracked files in them:\n%s");
|
||||||
|
|
||||||
if (!strcmp(cmd, "checkout"))
|
if (!strcmp(cmd, "checkout"))
|
||||||
msg = advice_commit_before_merge
|
msg = advice_commit_before_merge
|
||||||
|
Loading…
Reference in New Issue
Block a user