Fix '--relative-date'

This fixes '--relative-date' so that it does not give '0
year, 12 months', for the interval 360 <= diff < 365.

Signed-off-by: Johan Sageryd <j416@1616.se>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Johan Sageryd 2009-10-03 13:20:18 +09:00 committed by Jeff King
parent b4ae5e2ac4
commit dbc1b1f710
2 changed files with 2 additions and 1 deletions

2
date.c
View File

@ -123,7 +123,7 @@ const char *show_date_relative(unsigned long time, int tz,
return timebuf;
}
/* Say months for the past 12 months or so */
if (diff < 360) {
if (diff < 365) {
snprintf(timebuf, timebuf_size, "%lu months ago", (diff + 15) / 30);
return timebuf;
}

View File

@ -24,6 +24,7 @@ check_show 13000000 '5 months ago'
check_show 37500000 '1 year, 2 months ago'
check_show 55188000 '1 year, 9 months ago'
check_show 630000000 '20 years ago'
check_show 31449600 '12 months ago'
check_parse() {
echo "$1 -> $2" >expect