diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:31 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:53 -0800 |
| commit | 48168851cffcd14e01d3a10473a02ca4b4479402 (patch) | |
| tree | a90c67462c18ead3ab453279859360746c48b8b8 | |
| parent | i18n: git-add "The following paths are ignored" message (diff) | |
| download | tgif-48168851cffcd14e01d3a10473a02ca4b4479402.tar.xz | |
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>
| -rw-r--r-- | builtin/add.c | 2 | ||||
| -rwxr-xr-x | t/t3700-add.sh | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/builtin/add.c b/builtin/add.c index 21776ac52b..ffbd45986a 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -451,7 +451,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (excluded(&dir, pathspec[i], &dtype)) dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i])); } else - die("pathspec '%s' did not match any files", + die(_("pathspec '%s' did not match any files"), pathspec[i]); } } diff --git a/t/t3700-add.sh b/t/t3700-add.sh index ac115edbb7..7de42faf48 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -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' " echo ignored-file >>.gitignore && - 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_must_fail git add --dry-run track-this ignored-file >actual 2>&1 +" + +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 |