git/date.c, branch v1.7.2

parse_date: fix signedness in timezone calculation

2010-07-05T18:57:07Z

When no timezone is specified, we deduce the offset by subtracting the result of mktime from our calculated timestamp. However, our timestamp is stored as an unsigned integer, meaning we perform the subtraction as unsigned. For a negative offset, this means we wrap to a very high number, and our numeric timezone is in the millions of hours. You can see this bug by doing: $ TZ=EST \ GIT_AUTHOR_DATE='2010-06-01 10:00' \ git commit -a -m foo $ git cat-file -p HEAD | grep author author Jeff King 1275404416 +119304128 Instead, we should perform this subtraction as a time_t, the same type that mktime returns. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rr/parse-date-refactor'

2010-06-21T13:02:47Z

* rr/parse-date-refactor: Refactor parse_date for approxidate functions

Refactor parse_date for approxidate functions

2010-06-07T22:52:43Z

approxidate_relative and approxidate_careful both use parse_date to dump the timestamp to a character buffer and parse it back into a long unsigned using strtoul(). Avoid doing this by creating a new parse_date_toffset method. Noticed-by: Jonathan Nieder Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano

Add "Z" as an alias for the timezone "UTC"

2010-05-19T05:00:17Z

The name "Z" for the UTC timezone is required to properly parse ISO 8601 timestamps. Add it to the list of recognized timezones. Because timezone names can be shorter than 3 letters, loosen the restriction in match_alpha() that used to require at least 3 letters to match to allow a short timezone name as long as it matches exactly. Prior to the introduction of the "Z" zone, this already affected the timezone "NT" (Nome). Signed-off-by: Marcus Comstedt Reviewed-by: Jay Soffian Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-reflog-bad-timestamp'

2010-01-27T22:57:37Z

* jc/maint-reflog-bad-timestamp: t0101: use a fixed timestamp when searching in the reflog Update @{bogus.timestamp} fix not to die() approxidate_careful() reports errorneous date string

approxidate_careful() reports errorneous date string

2010-01-26T21:51:41Z

For a long time, the time based reflog syntax (e.g. master@{yesterday}) didn't complain when the "human readable" timestamp was misspelled, as the underlying mechanism tried to be as lenient as possible. The funny thing was that parsing of "@{now}" even relied on the fact that anything not recognized by the machinery returned the current timestamp. Introduce approxidate_careful() that takes an optional pointer to an integer, that gets assigned 1 when the input does not make sense as a timestamp. As I am too lazy to fix all the callers that use approxidate(), most of the callers do not take advantage of the error checking, but convert the code to parse reflog to use it as a demonstration. Tests are mostly from Jeff King. Signed-off-by: Junio C Hamano

date.c: mark file-local function static

2010-01-20T22:37:17Z

Signed-off-by: Junio C Hamano

Fix '--relative-date'

2009-10-03T10:04:38Z

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 Signed-off-by: Jeff King

fix approxidate parsing of relative months and years

2009-08-31T05:04:56Z

These were broken by b5373e9. The problem is that the code marks the month and year with "-1" for "we don't know it yet", but the month and year code paths were not adjusted to fill in the current time before doing their calculations (whereas other units follow a different code path and are fine). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Add date formatting and parsing functions relative to a given time

2009-08-31T02:59:11Z

The main purpose is to allow predictable testing of the code. Signed-off-by: Alex Riesen Signed-off-by: Jeff King Signed-off-by: Junio C Hamano