Browse Source

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>
maint
Matheus Tavares 4 years ago committed by Junio C Hamano
parent
commit
48960894f5
  1. 2
      builtin/add.c
  2. 2
      t/t3700-add.sh

2
builtin/add.c

@ -55,7 +55,7 @@ static void chmod_pathspec(struct pathspec *pathspec, char flip, int show_only) @@ -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);
}
}


2
t/t3700-add.sh

@ -398,7 +398,7 @@ test_expect_success 'git add --chmod --dry-run reports error for non regular fil @@ -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' '

Loading…
Cancel
Save