apply --reject: overwrite existing `.rej` symlink if it exists

[thirdparty/git.git] / column.c

diff --git a/column.c b/column.c
index 1261e18a72e9727e6d4e530e7068ffb319f59548..fbf88639aaed931602b203f012468cdeefda284f 100644 (file)
--- a/column.c
+++ b/column.c
@@ -23,7 +23,7 @@ struct column_data {
 /* return length of 's' in letters, ANSI escapes stripped */
 static int item_length(const char *s)
 {
-       return utf8_strnwidth(s, -1, 1);
+       return utf8_strnwidth(s, strlen(s), 1);
 }
 
 /*