Merge branch 'ja/i18n'

diff --git a/builtin/blame.c b/builtin/blame.c
index ab66cde2c2cf0f535678469cdf6eb6e37cd3113b..7ec782343002d27b1b7fdd7e61fada12e81eeaf1 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2633,6 +2633,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
        case DATE_RAW:
                blame_date_width = sizeof("1161298804 -0700");
                break;
+       case DATE_UNIX:
+               blame_date_width = sizeof("1161298804");
+               break;
        case DATE_SHORT:
                blame_date_width = sizeof("2006-10-19");
                break;
@@ -2805,7 +2808,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
        lno = prepare_lines(&sb);
 
        if (lno && !range_list.nr)
-               string_list_append(&range_list, xstrdup("1"));
+               string_list_append(&range_list, "1");
 
        anchor = 1;
        range_set_init(&ranges, range_list.nr);