add: mark --chmod error string for translation

matheustavares · gitster · commit 48960894f5a8 · 2021-02-24T12:14:51.000-08:00
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 &lt;matheus.bernardino@usp.br&gt;
Reviewed-by: Taylor Blau &lt;me@ttaylorr.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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' '

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static void chmod_pathspec(struct pathspec *pathspec, char flip, int show_only)`
`55`	`55`	`err = S_ISREG(ce->ce_mode) ? 0 : -1;`
`56`	`56`
`57`	`57`	`if (err < 0)`
`58`		`- fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name);`
	`58`	`+ error(_("cannot chmod %cx '%s'"), flip, ce->name);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ test_expect_success 'git add --chmod --dry-run reports error for non regular fil`
`398`	`398`	`git reset --hard &&`
`399`	`399`	`test_ln_s_add foo foo4 &&`
`400`	`400`	`git add --chmod=+x --dry-run foo4 2>stderr &&`
`401`		`- grep "cannot chmod +x .foo4." stderr`
	`401`	`+ test_i18ngrep "cannot chmod +x .foo4." stderr`
`402`	`402`	`'`
`403`	`403`
`404`	`404`	`test_expect_success 'git add --chmod --dry-run reports error for unmatched pathspec' '`