summaryrefslogtreecommitdiff
path: root/date.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-02 13:41:43 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-03 23:11:32 -0800
commit2c733fb24c10a9d7aacc51f956bf9b7881980870 (patch)
tree104b1c36ce3c47921f5d3fab81f5c7e7431a6d71 /date.c
parent116eb3abfe4f79907f701317c2d905868941fff7 (diff)
downloadgit-2c733fb24c10a9d7aacc51f956bf9b7881980870.tar.gz
parse_date(): '@' prefix forces git-timestampjc/parse-date-raw
The only place that the issue this series addresses was observed where we read "cat-file commit" output and put it in GIT_AUTHOR_DATE in order to replay a commit with an ancient timestamp. With the previous patch alone, "git commit --date='20100917 +0900'" can be misinterpreted to mean an ancient timestamp, not September in year 2010. Guard this codepath by requring an extra '@' in front of the raw git timestamp on the parsing side. This of course needs to be compensated by updating get_author_ident_from_commit and the code for "git commit --amend" to prepend '@' to the string read from the existing commit in the GIT_AUTHOR_DATE environment variable. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'date.c')
-rw-r--r--date.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/date.c b/date.c
index 099ddbe7fc..bf8e088e6a 100644
--- a/date.c
+++ b/date.c
@@ -637,7 +637,8 @@ int parse_date_basic(const char *date, unsigned long *timestamp, int *offset)
*offset = -1;
tm_gmt = 0;
- if (!match_object_header_date(date, timestamp, offset))
+ if (*date == '@' &&
+ !match_object_header_date(date + 1, timestamp, offset))
return 0; /* success */
for (;;) {
int match = 0;