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 v5 0/4] approxidate: tweak special date formats
Date: Thu, 21 May 2026 13:54:04 +0300 [thread overview]
Message-ID: <20260521105408.8222-1-taahol@utu.fi> (raw)
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
next prev parent reply other threads:[~2026-05-21 10:54 UTC|newest]
Thread overview: 36+ 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 ` [PATCH v3 0/4] approxidate: tweak special date formats Tuomas Ahola
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
2026-05-16 15:15 ` [PATCH v4 0/4] approxidate: tweak special date formats Tuomas Ahola
2026-05-16 15:15 ` [PATCH v4 1/4] approxidate: make "today" wrap to midnight Tuomas Ahola
2026-05-16 15:15 ` [PATCH v4 2/4] t0006: add support for approxidate test date adjustment Tuomas Ahola
2026-05-16 15:15 ` [PATCH v4 3/4] approxidate: make "specials" respect fixed day-of-month Tuomas Ahola
2026-05-16 15:15 ` [PATCH v4 4/4] approxidate: use deferred mday adjustments for "specials" Tuomas Ahola
2026-05-18 2:40 ` [PATCH] fixup! " Tuomas Ahola
2026-05-21 10:54 ` Tuomas Ahola [this message]
2026-05-21 10:54 ` [PATCH v5 1/4] approxidate: make "today" wrap to midnight Tuomas Ahola
2026-05-21 10:54 ` [PATCH v5 2/4] t0006: add support for approxidate test date adjustment Tuomas Ahola
2026-05-21 10:54 ` [PATCH v5 3/4] approxidate: make "specials" respect fixed day-of-month Tuomas Ahola
2026-05-21 10:54 ` [PATCH v5 4/4] approxidate: use deferred mday adjustments for "specials" Tuomas Ahola
2026-05-21 13:33 ` [PATCH v5 0/4] approxidate: tweak special date formats Junio C Hamano
2026-05-21 14:14 ` 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=20260521105408.8222-1-taahol@utu.fi \
--to=taahol@utu$(echo .)fi \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox