summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-02 13:41:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-03 23:11:32 -0800
commit2c733fb24c10a9d7aacc51f956bf9b7881980870 (patch)
tree104b1c36ce3c47921f5d3fab81f5c7e7431a6d71 /builtin/merge-index.c
parentparse_date(): allow ancient git-timestamp (diff)
downloadtgif-2c733fb24c10a9d7aacc51f956bf9b7881980870.tar.xz
parse_date(): '@' prefix forces git-timestamp
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 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions