From: Tuomas Ahola <taahol@utu•fi>
To: <git@vger•kernel.org>
Cc: Tuomas Ahola <taahol@utu•fi>
Subject: [PATCH 2/2] approxidate: overwrite tm_mday for `now` and `yesterday`
Date: Tue, 18 Mar 2025 20:02:01 +0200 [thread overview]
Message-ID: <20250318180201.3653-3-taahol@utu.fi> (raw)
In-Reply-To: <20250318180201.3653-1-taahol@utu.fi>
Date specifications now (or today) and yesterday should refer to
actual current or previous day. Especially "noon today" or "noon
yesterday" should override the usual logic of using the first previous
noon depending on the current time.
Signed-off-by: Tuomas Ahola <taahol@utu•fi>
---
date.c | 3 +++
t/t0006-date.sh | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/date.c b/date.c
index 482a2f8c99..2a8a942d64 100644
--- a/date.c
+++ b/date.c
@@ -1121,12 +1121,14 @@ static void pending_number(struct tm *tm, int *num)
static void date_now(struct tm *tm, struct tm *now, int *num)
{
*num = 0;
+ tm->tm_mday = -1;
update_tm(tm, now, 0);
}
static void date_yesterday(struct tm *tm, struct tm *now, int *num)
{
*num = 0;
+ tm->tm_mday = -1;
update_tm(tm, now, 24*60*60);
}
@@ -1204,6 +1206,7 @@ static const struct special {
{ "AM", date_am },
{ "never", date_never },
{ "now", date_now },
+ { "today", date_now },
{ NULL }
};
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 5db4b23e0b..6ad931dfb3 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -178,10 +178,10 @@ check_approxidate '6am yesterday' '2009-08-29 06:00:00'
check_approxidate '6pm yesterday' '2009-08-29 18:00:00'
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 'noon yesterday' '2009-08-29 12:00:00'
(
GIT_TEST_DATE_NOW=$(($GIT_TEST_DATE_NOW-12*60*60)); export GIT_TEST_DATE_NOW
+ check_approxidate 'noon today' '2009-08-30 12:00:00'
+ check_approxidate 'noon yesterday' '2009-08-29 12:00:00'
check_approxidate 'January 5th noon pm' '2009-01-05 12:00:00'
)
check_approxidate '10am noon' '2009-08-29 12:00:00'
--
2.30.2
next prev parent reply other threads:[~2025-03-18 18:17 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 ` Tuomas Ahola [this message]
2025-04-04 8:40 ` [PATCH 2/2] approxidate: overwrite tm_mday for `now` and `yesterday` 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 ` [PATCH v5 0/4] approxidate: tweak special date formats Tuomas Ahola
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=20250318180201.3653-3-taahol@utu.fi \
--to=taahol@utu$(echo .)fi \
--cc=git@vger$(echo .)kernel.org \
/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