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 <matheus.bernardino@usp.br>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/add.c b/builtin/add.c
index 1e33ab81f2e80d8d66b404e5bc53334de4ca7311..0c5f53c0bb7f3d922078b3d282ec77aa725f66ac 100644 (file)
--- 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 fc81f2ef005877d5004b4176c198700d95e3dc33..6a8b94a4f742c83780819f3964fc19a200782dff 100755 (executable)
--- 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' '