From: Tuomas Ahola <taahol@utu.fi>
To: <git@vger.kernel.org>
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Tuomas Ahola <taahol@utu.fi>
Subject: [PATCH v3 0/4] approxidate: tweak special date formats
Date: Thu, 14 May 2026 14:55:16 +0300 [thread overview]
Message-ID: <20260514115520.6660-1-taahol@utu.fi> (raw)
In-Reply-To: <20260512145430.13212-1-taahol@utu.fi>
The approxidate system is an endless source of absurdities. Let's make the
usual "eh, that's crazy, let's do better with this input" type of fix[1], and
tweak some sharp edge cases, including one noticed by Linus back in 2006[2].
After this series, "tea" and "noon" will work predictably with all kinds of
date formats (today, yesterday, last Friday, January 5th, one year ago
yesterday...) regardless of the current time of day.
Links:
1. https://lore.kernel.org/git/20181115144854.GB16450@sigill.intra.peff.net/
2. https://lore.kernel.org/git/Pine.LNX.4.64.0610101102560.3952@g5.osdl.org/
Tuomas Ahola (4):
t0006: add support for approxidate test date adjustment
approxidate: alias "today" to "now"
approxidate: make "specials" respect fixed day-of-month
approxidate: use deferred mday adjustments for "specials"
date.c | 36 ++++++++++++++++++++++++++----------
t/t0006-date.sh | 41 ++++++++++++++++++++++++++++++++++++++++-
2 files changed, 66 insertions(+), 11 deletions(-)
Intervall-diff mot v2:
1: 118f1825ac < -: ---------- t0006: add support for approxidate test date adjustment
2: 21c4858c47 < -: ---------- approxidate: make "specials" respect fixed day-of-month
-: ---------- > 1: 7ea9c9967b t0006: add support for approxidate test date adjustment
-: ---------- > 2: 3a21727dbe approxidate: alias "today" to "now"
-: ---------- > 3: d1992d23d0 approxidate: make "specials" respect fixed day-of-month
3: cf72403102 ! 4: 0b1a10305c approxidate: use deferred mday adjustments for "specials"
@@ date.c: static void pending_number(struct tm *tm, int *num)
+static void date_time(struct tm *tm, int hour)
{
/*
- * By default, "tea" and "noon" refer to last such time in the
- * past, be it today or yesterday. With a specified mday,
-- * that logic is overridden.
-+ * or e.g. "noon today", that logic is overridden.
+ * If we do not yet have a specified day, we'll use the most recent
+ * version of "hour" relative to now. But that may be yesterday.
*/
if (tm->tm_mday < 0 && tm->tm_hour < hour)
- update_tm(tm, now, 24*60*60);
@@ t/t0006-date.sh
@@ t/t0006-date.sh: check_approxidate '3:00' '2009-08-30 03:00:00'
check_approxidate '15:00' '2009-08-30 15:00:00'
check_approxidate 'noon today' '2009-08-30 12:00:00'
- check_approxidate 'today at noon' '2009-08-30 12:00:00' success -12
-+check_approxidate 'noon today' '2009-09-01 12:00:00' success +36
+ check_approxidate 'today at noon' '2009-08-30 12:00:00' '-12 hours'
++check_approxidate 'noon today' '2009-09-01 12:00:00' '+36 hours'
check_approxidate 'noon yesterday' '2009-08-29 12:00:00'
check_approxidate 'last Friday at noon' '2009-08-28 12:00:00'
- check_approxidate 'last Friday at noon' '2009-08-28 12:00:00' success -12
-+check_approxidate 'noon yesterday' '2009-08-29 12:00:00' success -12
+ check_approxidate 'last Friday at noon' '2009-08-28 12:00:00' '-12 hours'
++check_approxidate 'noon yesterday' '2009-08-29 12:00:00' '-12 hours'
+check_approxidate 'tea last saturday' '2009-08-29 17:00:00'
-+check_approxidate 'tea last saturday' '2009-08-29 17:00:00' success -12
++check_approxidate 'tea last saturday' '2009-08-29 17:00:00' '-12 hours'
check_approxidate 'January 5th noon pm' '2009-01-05 12:00:00'
- check_approxidate 'January 5th noon pm' '2009-01-05 12:00:00' success -12
+ check_approxidate 'January 5th noon pm' '2009-01-05 12:00:00' '-12 hours'
check_approxidate '10am noon' '2009-08-29 12:00:00'
base-commit: c44beea485f0f2feaf460e2ac87fdd5608d63cf0
--
2.30.2
next prev parent reply other threads:[~2026-05-14 11:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-18 18:01 [PATCH 0/2] approxidate: tweak special date formats Tuomas Ahola
2025-03-18 18:02 ` [PATCH 1/2] approxidate: make "specials" respect fixed day-of-month Tuomas Ahola
2025-04-04 8:19 ` Jeff King
2025-03-18 18:02 ` [PATCH 2/2] approxidate: overwrite tm_mday for `now` and `yesterday` Tuomas Ahola
2025-04-04 8:40 ` Jeff King
2026-05-12 14:54 ` [PATCH v2 0/3] approxidate: tweak special date formats Tuomas Ahola
2026-05-12 14:54 ` [PATCH v2 1/3] t0006: add support for approxidate test date adjustment Tuomas Ahola
2026-05-12 16:34 ` Junio C Hamano
2026-05-12 18:35 ` Jeff King
2026-05-12 14:54 ` [PATCH v2 2/3] approxidate: make "specials" respect fixed day-of-month Tuomas Ahola
2026-05-12 16:52 ` Junio C Hamano
2026-05-12 14:54 ` [PATCH v2 3/3] approxidate: use deferred mday adjustments for "specials" Tuomas Ahola
2026-05-14 11:55 ` Tuomas Ahola [this message]
2026-05-14 11:55 ` [PATCH v3 1/4] t0006: add support for approxidate test date adjustment Tuomas Ahola
2026-05-14 11:55 ` [PATCH v3 2/4] approxidate: alias "today" to "now" Tuomas Ahola
2026-05-14 15:36 ` Junio C Hamano
2026-05-14 21:07 ` Tuomas Ahola
2026-05-15 1:27 ` Junio C Hamano
2026-05-15 1:38 ` Junio C Hamano
2026-05-15 5:02 ` Tuomas Ahola
2026-05-14 11:55 ` [PATCH v3 3/4] approxidate: make "specials" respect fixed day-of-month Tuomas Ahola
2026-05-14 16:06 ` Junio C Hamano
2026-05-14 11:55 ` [PATCH v3 4/4] approxidate: use deferred mday adjustments for "specials" Tuomas Ahola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260514115520.6660-1-taahol@utu.fi \
--to=taahol@utu.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.