From 48960894f5a89639809bdad5618439ba59869522 Mon Sep 17 00:00:00 2001 From: Matheus Tavares Date: Mon, 22 Feb 2021 22:10:34 -0300 Subject: add: mark --chmod error string for translation This error message is intended for humans, so mark it for translation. Also use error() instead of fprintf(stderr, ...), to make the corresponding line a bit cleaner, and to display the "error:" prefix, which helps classifying the nature/severity of the message. Signed-off-by: Matheus Tavares Reviewed-by: Taylor Blau Signed-off-by: Junio C Hamano diff --git a/builtin/add.c b/builtin/add.c index 1e33ab8..0c5f53c 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -55,7 +55,7 @@ static void chmod_pathspec(struct pathspec *pathspec, char flip, int show_only) err = S_ISREG(ce->ce_mode) ? 0 : -1; if (err < 0) - fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name); + error(_("cannot chmod %cx '%s'"), flip, ce->name); } } diff --git a/t/t3700-add.sh b/t/t3700-add.sh index fc81f2e..6a8b94a 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -398,7 +398,7 @@ test_expect_success 'git add --chmod --dry-run reports error for non regular fil git reset --hard && test_ln_s_add foo foo4 && git add --chmod=+x --dry-run foo4 2>stderr && - grep "cannot chmod +x .foo4." stderr + test_i18ngrep "cannot chmod +x .foo4." stderr ' test_expect_success 'git add --chmod --dry-run reports error for unmatched pathspec' ' -- cgit v0.10.2-6-g49f6