Merge branch 'tg/checkout-no-overlay'

diff --git a/builtin/blame.c b/builtin/blame.c
index 0074ed311c8b6c26770f62a668f51abda316ec46..581de0d8322681ef11026b3e36a81c7baf0fda38 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -925,6 +925,10 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                 */
                blame_date_width = utf8_strwidth(_("4 years, 11 months ago")) + 1; /* add the null */
                break;
+       case DATE_HUMAN:
+               /* If the year is shown, no time is shown */
+               blame_date_width = sizeof("Thu Oct 19 16:00");
+               break;
        case DATE_NORMAL:
                blame_date_width = sizeof("Thu Oct 19 16:00:04 2006 -0700");
                break;