git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 4/4] approxidate: use deferred mday adjustments for "specials"

From
Tuomas Ahola <taahol@utu.fi>
Date
May 16, 2026, 15:15 UTC
Message-ID
<20260516151540.9611-5-taahol@utu.fi>
In-Reply-To
<20260516151540.9611-1-taahol@utu.fi>

There are cases where the "wrap-to-yesterday" behavior of "tea" and "noon" should be reverted later on down the line, so that "today tea" and "tea today" won't yield different results. However, the logic of approxidate doesn't seem to lend itself particularly well to such cases.

Start tackling the issue by reusing negative values of `tm->tm_mday` field for deferred date adjustments which can be easily reverted, so that the default logic of the special formats only applies if we don't get any explicit date (mday) specification. In particular, overwrite the field with -1 in "today" and "yesterday", so that those formats will be relative to the current date. That makes specifications like "tea yesterday" behave more sensibly: instead of going backwards to the last tea-time and then a day back, Git will now understand that as the tea-time of yesterday.

Replace the call of `update_tm()` in `date_time()` with the assignment `tm->tm_mday = -2`. Add the corresponding code to handle that in `update_tm()`, wrapping to the previous day if the field still holds such assignment, meaning that we haven't seen any better specification for the day-of-month. On the other hand, `mday=-3` would mean going two days back and so on. Even though such functionality isn't actually needed by this patch, it won't add much complexity in the code and is rather natural way to handle such values.

As `date_time()` won't no longer need the `now` struct, mark the associated function parameters as unused. The parameters themselves have to stay, however, as those functions are called through pointers in `approxidate_alpha`. Add relevant tests to cover the changes.

Signed-off-by: Tuomas Ahola <taahol@utu.fi>
---
 date.c          | 31 +++++++++++++++++++++----------
 t/t0006-date.sh |  4 ++++
 2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/date.c b/date.c
index 7a458f3cac..6e7cf907da 100644
--- a/date.c
+++ b/date.c
@@ -1071,13 +1071,22 @@ void datestamp(struct strbuf *out)
 /*
  * Relative time update (eg "2 days ago").  If we haven't set the time
  * yet, we need to set it from current time.
+ *
+ * The tm->tm_mday field has an additional logic of using negative values
+ * for date adjustments: -2 means yesterday and -3 the day before that,
+ * and so on.  The idea is to deref such adjustments until we are sure
+ * there's no explicit mday specification in the approxidate string.
  */
 static time_t update_tm(struct tm *tm, struct tm *now, time_t sec)
 {
 	time_t n;
 
-	if (tm->tm_mday < 0)
+	if (tm->tm_mday < 0) {
+		int offset = tm->tm_mday + 1;
+		if (sec == 0 && offset < 0)
+			sec = -offset * 24*60*60;
 		tm->tm_mday = now->tm_mday;
+	}
 	if (tm->tm_mon < 0)
 		tm->tm_mon = now->tm_mon;
 	if (tm->tm_year < 0) {
@@ -1127,38 +1136,39 @@ static void date_now(struct tm *tm, struct tm *now, int *num)
 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);
 }
 
-static void date_time(struct tm *tm, struct tm *now, int hour)
+static void date_time(struct tm *tm, int hour)
 {
 	/*
 	 * 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);
+		tm->tm_mday = -2; /* eventually handled by update_tm() */
 	tm->tm_hour = hour;
 	tm->tm_min = 0;
 	tm->tm_sec = 0;
 }
 
-static void date_midnight(struct tm *tm, struct tm *now, int *num)
+static void date_midnight(struct tm *tm, struct tm *now UNUSED, int *num)
 {
 	pending_number(tm, num);
-	date_time(tm, now, 0);
+	date_time(tm, 0);
 }
 
-static void date_noon(struct tm *tm, struct tm *now, int *num)
+static void date_noon(struct tm *tm, struct tm *now UNUSED, int *num)
 {
 	pending_number(tm, num);
-	date_time(tm, now, 12);
+	date_time(tm, 12);
 }
 
-static void date_tea(struct tm *tm, struct tm *now, int *num)
+static void date_tea(struct tm *tm, struct tm *now UNUSED, int *num)
 {
 	pending_number(tm, num);
-	date_time(tm, now, 17);
+	date_time(tm, 17);
 }
 
 static void date_pm(struct tm *tm, struct tm *now UNUSED, int *num)
@@ -1201,7 +1211,8 @@ static void date_today(struct tm *tm, struct tm *now, int *num UNUSED)
 	if (tm->tm_hour == now->tm_hour &&
 	    tm->tm_min == now->tm_min &&
 	    tm->tm_sec == now->tm_sec)
-		date_time(tm, now, 0);
+		date_time(tm, 0);
+	tm->tm_mday = -1;
 	update_tm(tm, now, 0);
 }
 
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 7358903046..b187b1bfc4 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -210,9 +210,13 @@ 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' '-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' '-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 '10am noon' '2009-08-29 12:00:00'
-- 
2.30.2
Previous: Tuomas AholaNext: Tuomas Ahola
Message 25 of 36 in “approxidate: tweak special date formats”
  1. 0/2 approxidate: tweak special date formatsTuomas Ahola, Mar 18, 2025
  2. 2/2 approxidate: overwrite tm_mday for `now` and `yesterday`Tuomas Ahola, Mar 18, 2025
  3. Jeff KingApr 4, 2025
  4. 1/2 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, Mar 18, 2025
  5. Jeff KingApr 4, 2025
  6. 0/3 approxidate: tweak special date formatsTuomas Ahola, May 12, 2026
  7. 1/3 t0006: add support for approxidate test date adjustmentTuomas Ahola, May 12, 2026
  8. Junio C HamanoMay 12, 2026
  9. Jeff KingMay 12, 2026
  10. 2/3 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, May 12, 2026
  11. Junio C HamanoMay 12, 2026
  12. 3/3 approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 12, 2026
  13. 0/4 approxidate: tweak special date formatsTuomas Ahola, May 14, 2026
  14. 2/4 approxidate: alias "today" to "now"Tuomas Ahola, May 14, 2026
  15. Junio C HamanoMay 14, 2026
  16. Tuomas AholaMay 14, 2026
  17. Junio C HamanoMay 15, 2026
  18. Junio C HamanoMay 15, 2026
  19. Tuomas AholaMay 15, 2026
  20. 1/4 t0006: add support for approxidate test date adjustmentTuomas Ahola, May 14, 2026
  21. 3/4 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, May 14, 2026
  22. Junio C HamanoMay 14, 2026
  23. 4/4 approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 14, 2026
  24. 0/4 approxidate: tweak special date formatsTuomas Ahola, May 16, 2026
  25. 4/4 approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 16, 2026
  26. fixup! approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 18, 2026
  27. 2/4 t0006: add support for approxidate test date adjustmentTuomas Ahola, May 16, 2026
  28. 1/4 approxidate: make "today" wrap to midnightTuomas Ahola, May 16, 2026
  29. 3/4 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, May 16, 2026
  30. 0/4 approxidate: tweak special date formatsTuomas Ahola, May 21, 2026
  31. 1/4 approxidate: make "today" wrap to midnightTuomas Ahola, May 21, 2026
  32. 3/4 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, May 21, 2026
  33. 4/4 approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 21, 2026
  34. 2/4 t0006: add support for approxidate test date adjustmentTuomas Ahola, May 21, 2026
  35. Junio C HamanoMay 21, 2026
  36. Tuomas AholaMay 21, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.