From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 5 Jan 2006 03:33:55 +0000 (-0800)
Subject: Fix nasty approxidate bug
X-Git-Tag: v1.0.7^2~20
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b73cebf437252660cea670c27dcdedc422e1bff9;p=git.git

Fix nasty approxidate bug

Stupid me.

If approxidate ends up with a month that is ahead of the current month, it
decrements the year to last year.

Which is correct, and means that "last december" does the right thing.

HOWEVER. It should only do so if the year is the same as the current year.

Without this fix, "5 days ago" ends up being in 2004, because it first
decrements five days, getting us to December 2005 (correct), but then it
also ends up decrementing the year once more to turn that December into
"last year" (incorrect, since it already _was_ last year).

Duh. Pass me a donut.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/date.c b/date.c
index 3ede02777..416ea579a 100644
--- a/date.c
+++ b/date.c
@@ -640,7 +640,7 @@ unsigned long approxidate(const char *date)
 	}
 	if (number > 0 && number < 32)
 		tm.tm_mday = number;
-	if (tm.tm_mon > now.tm_mon)
+	if (tm.tm_mon > now.tm_mon && tm.tm_year == now.tm_year)
 		tm.tm_year--;
 	return mktime(&tm);
 }