summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johan Sageryd <j416@1616.se>2009-10-03 13:20:18 +0900
committerLibravatar Jeff King <peff@peff.net>2009-10-03 06:04:38 -0400
commitdbc1b1f71052c084a84b5c395e1cb4b5ae526fcb (patch)
tree6902dd23d4cec1554fd21be5ed5bf2e3cfee08e4
parenttests: make all test files executable (diff)
downloadtgif-dbc1b1f71052c084a84b5c395e1cb4b5ae526fcb.tar.xz
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>
-rw-r--r--date.c2
-rwxr-xr-xt/t0006-date.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/date.c b/date.c
index e9ee4aa748..5d05ef61cf 100644
--- a/date.c
+++ b/date.c
@@ -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;
}
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index a4d8fa8fa1..75b02af86d 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -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