From: Tuomas Ahola Date: Thu, 21 May 2026 10:54:04 GMT Subject: [PATCH v5 0/4] approxidate: tweak special date formats Message-ID: <20260521105408.8222-1-taahol@utu.fi> In-Reply-To: <20260516151540.9611-1-taahol@utu.fi> > "Friday noon" asked in the morning on Sunday was parsed to be one > day before the specified time, which has been corrected. Should we add something about the new semantics of "today"? Tuomas Ahola (4): approxidate: make "today" wrap to midnight t0006: add support for approxidate test date adjustment approxidate: make "specials" respect fixed day-of-month approxidate: use deferred mday adjustments for "specials" Documentation/rev-list-options.adoc | 3 +- date.c | 46 ++++++++++++++++++++++------- t/t0006-date.sh | 44 ++++++++++++++++++++++++++- 3 files changed, 81 insertions(+), 12 deletions(-) Interdiff mot v4: diff --git a/date.c b/date.c index 6e7cf907da..05b78d852f 100644 --- a/date.c +++ b/date.c @@ -1206,12 +1206,13 @@ static void date_never(struct tm *tm, struct tm *now UNUSED, int *num) *num = 0; } -static void date_today(struct tm *tm, struct tm *now, int *num UNUSED) +static void date_today(struct tm *tm, struct tm *now, int *num) { if (tm->tm_hour == now->tm_hour && tm->tm_min == now->tm_min && tm->tm_sec == now->tm_sec) date_time(tm, 0); + *num = 0; tm->tm_mday = -1; update_tm(tm, now, 0); } diff --git a/t/t0006-date.sh b/t/t0006-date.sh index b187b1bfc4..9a76b84ed9 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -212,13 +212,14 @@ check_approxidate 'noon today' '2009-08-30 12:00:00' 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 'noon yesterday' '2009-08-29 12:00:00' '-12 hours' check_approxidate 'last Friday at noon' '2009-08-28 12:00:00' 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' '-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' '-12 hours' +check_approxidate 'January 5th today pm' '2009-01-30 12:00:00' check_approxidate '10am noon' '2009-08-29 12:00:00' check_approxidate 'January 5th yesterday' '2009-01-29 19:20:00' check_approxidate 'January 5th yesterday' '2008-12-31 19:20:00' '+2 days' base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0 -- 2.30.2