kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

unpack-trees: fix grammar for untracked files in directories 

Noticed-by: David Turner <dturner@twosigma.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: David Turner <dturner@twosigma.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 2016-12-02 11:17:41 -08:00 committed by Junio C Hamano
parent 2e3926b948
commit 584f99c87b
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