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

Merge branch 'sb/unpack-trees-grammofix' into maint

Browse Source 
* sb/unpack-trees-grammofix:
  unpack-trees: fix grammar for untracked files in directories
This commit is contained in:
Junio C Hamano 2017-01-17 15:19:05 -08:00
commit 1addc197eb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

2
unpack-trees.c
View File

@ -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