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

i18n: git-add "did not match any files" message 

Make the "did not match any files" message translatable, and skip the
test that checks for it when the C_LOCALE_OUTPUT prereq is not
present.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2011-02-22 23:41:31 +00:00 committed by Junio C Hamano
parent 439fb8296d
commit 48168851cf
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/add.c
View File

@ -451,7 +451,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (excluded(&dir, pathspec[i], &dtype)) if (excluded(&dir, pathspec[i], &dtype))
dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i])); dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
} else } else
die("pathspec '%s' did not match any files", die(_("pathspec '%s' did not match any files"),
pathspec[i]); pathspec[i]);
} }
} }

8
t/t3700-add.sh
View File

@ -268,8 +268,12 @@ test_expect_success 'git add --dry-run of existing changed file' "


test_expect_success 'git add --dry-run of non-existing file' " test_expect_success 'git add --dry-run of non-existing file' "
echo ignored-file >>.gitignore && echo ignored-file >>.gitignore &&
test_must_fail git add --dry-run track-this ignored-file >actual 2>&1 && test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
echo \"fatal: pathspec 'ignored-file' did not match any files\" | test_cmp - actual "

test_expect_success C_LOCALE_OUTPUT 'git add --dry-run of an existing file output' "
echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
test_cmp expect actual
" "


cat >expect.err <<\EOF cat >expect.err <<\EOF