Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
>> But I had enough of UTF-8 for a day.
>
> Okay, so I lied (this are both patches revised and combined):
I am thinking of putting this in 'next', with the following
changes on top of your combined patch.
git-commit-tree warns if the commit message does not minimally
conform to the UTF-8 encoding when i18n.commitencoding is either
unset, or set to "utf-8". It does not die as in your version.
builtin-commit-tree.c | 13 +++++++------
utf8.c | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c
index f274721..f641787 100644
--- a/builtin-commit-tree.c
+++ b/builtin-commit-tree.c
@@ -78,6 +78,11 @@ static int new_parent(int idx)
return 1;
}
+static const char commit_utf8_warn[] =
+"Warning: commit message does not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n";
+
int cmd_commit_tree(int argc, const char **argv, const char *prefix)
{
int i;
@@ -133,12 +138,8 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
/* And check the encoding */
buffer[size] = '\0';
- if (!strcmp(git_commit_encoding, "utf-8") && !is_utf8(buffer)) {
- fprintf(stderr, "Commit message does not conform to UTF-8.\n"
- "Please fix the message,"
- " or set the config variable i18n.commitencoding.\n");
- return 1;
- }
+ if (!strcmp(git_commit_encoding, "utf-8") && !is_utf8(buffer))
+ fprintf(stderr, commit_utf8_warn);
if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
printf("%s\n", sha1_to_hex(commit_sha1));
diff --git a/utf8.c b/utf8.c
index aed60ad..8fa6257 100644
--- a/utf8.c
+++ b/utf8.c
@@ -244,7 +244,7 @@ void print_wrapped_text(const char *text, int indent, int indent2, int width)
for (;;) {
char c = *text;
if (!c || isspace(c)) {
- if (w < width || space < 0) {
+ if (w < width || !space) {
const char *start = bol;
if (space)
start = space;
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html