summaryrefslogtreecommitdiff
path: root/t/t6010-merge-base.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-05-01 21:12:42 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-05-02 14:15:22 -0700
commit14ac2864dcd566a025e449ab9db6b5dc57744a32 (patch)
tree59b940b6d6c267cf8cd80069d530f15175051686 /t/t6010-merge-base.sh
parentcommit: print "Date" line when the user has set date (diff)
downloadtgif-14ac2864dcd566a025e449ab9db6b5dc57744a32.tar.xz
commit: accept more date formats for "--date"
Right now we pass off the string found by "--date" straight to the fmt_ident function, which will use our strict parse_date to normalize it. However, this means obvious things like "--date=now" or "--date=2.days.ago" will not work. Instead, let's fallback to the approxidate function to handle this for us. Note that we must try parse_date ourselves first, even though approxidate will try strict parsing itself. The reason is that approxidate throws away any timezone information it sees from the strict parsing, and we want to preserve it. So asking for: git commit --date="@1234567890 -0700" continues to set the date in -0700, regardless of what the local timezone is. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6010-merge-base.sh')
0 files changed, 0 insertions, 0 deletions