[PATCH v4 12/73] gettextize: git-add "did not match any files" message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 22, 2011, 23:41 UTC
- Message-ID
- <1298418152-27789-13-git-send-email-avarab@gmail.com>
- In-Reply-To
- <7vhbbwdjnm.fsf@alter.siamese.dyndns.org>
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> --- builtin/add.c | 2 +- t/t3700-add.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c index 21776ac..ffbd459 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 ac115ed..7de42fa 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
-- 1.7.2.3