diff options
| author | Johan Sageryd <j416@1616.se> | 2009-10-03 13:20:18 +0900 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2009-10-03 06:04:38 -0400 |
| commit | dbc1b1f71052c084a84b5c395e1cb4b5ae526fcb (patch) | |
| tree | 6902dd23d4cec1554fd21be5ed5bf2e3cfee08e4 | |
| parent | b4ae5e2ac4651097d0f2916f8e566f955a8fa586 (diff) | |
| download | git-dbc1b1f71052c084a84b5c395e1cb4b5ae526fcb.tar.gz git-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.c | 2 | ||||
| -rwxr-xr-x | t/t0006-date.sh | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -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 a4d8fa8fa..75b02af86 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 |