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

Re: [PATCH v2 2/3] approxidate: make "specials" respect fixed day-of-month

From
Junio C Hamano <gitster@pobox.com>
Date
May 12, 2026, 16:52 UTC
Message-ID
<xmqq33zwlgec.fsf@gitster.g>
In-Reply-To
<20260512145430.13212-3-taahol@utu.fi>
Tuomas Ahola <taahol@utu.fi> writes:
Show 9 quoted lines
> The special approxidate time formats, "noon" and "tea", wrap
> to the previous day if the current time is before 12 or 5 pm,
> respectively.  That holds even when an actual date is supplied;
> therefore, "10 May at tea" and "last Friday at noon" can cause
> the date to be set to a seemingly wrong day:
>
> 	now -> 2026-05-12 11:00:00 +0000
> 	10 May at tea -> 2026-05-09 17:00:00 +0000
> 	last Friday at noon -> 2026-05-07 12:00:00 +0000

It would help readers to say that Friday of that week was May 8th to make it easier for them to see why this is a wrong answer.

> 	One year ago yesterday at tea-time -> 2025-05-10 17:00:00 +0000
>
> The last example is from Linus Torvalds who remarked in 2006
> that the answer was "just silly and not even correct." [1]

It may be just me, but it was hard for me to guess if you are justifying how these answers are correct, or you are presenting examples of wrong output. Perhaps starting the paragraph with cases where the "wrap to the previous" gets right to set the stage may make it easier to understand? Let's see...

    The ... 'noon' and 'tea', wrap to the ... before 12 or 5 pm,
    respectively.  So for example if it is 11am on 2026-05-12, then
	now  -> 2026-05-12 11:00:00 +0000
	noon -> 2026-05-11 11:00:00 +0000
	tea  -> 2026-05-11 17:00:00 +0000
    which would work well when you ask for "git log --since=tea",
    for example.
    That hold even when ... seemingly wrong day:
Show 35 quoted lines
> As "last Friday at noon" is mentioned in the documentation
> (date-formats.adoc) it would be nice if it worked correctly.
> Let's fix the glitch with a simple patch.
>
> Check whether we already have a specified (non-negative) mday
> and make date_time() stick to it.  Add a suitable time offset
> to the relevant test.
>
> While we are at it, add "today" as an alias of "now", so that
> "today at noon" will do the right thing, too, and assert that
> with a new test.
>
> Links:
>   1. https://lore.kernel.org/git/Pine.LNX.4.64.0610101102560.3952@g5.osdl.org/
>
> Signed-off-by: Tuomas Ahola <taahol@utu.fi>
> ---
>  date.c          | 8 +++++++-
>  t/t0006-date.sh | 4 ++++
>  2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/date.c b/date.c
> index 17a95077cf..e48cc2a4d7 100644
> --- a/date.c
> +++ b/date.c
> @@ -1132,7 +1132,12 @@ static void date_yesterday(struct tm *tm, struct tm *now, int *num)
>  
>  static void date_time(struct tm *tm, struct tm *now, int hour)
>  {
> -	if (tm->tm_hour < 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.
> +	 */

Again, this may be just me, but I happen to find the version of comment in Peff's review on the earlier iteration of this series much easier to understand.

Show 9 quoted lines
> +	if (tm->tm_mday < 0 && tm->tm_hour < hour)
>  		update_tm(tm, now, 24*60*60);
>  	tm->tm_hour = hour;
>  	tm->tm_min = 0;
> @@ -1204,6 +1209,7 @@ static const struct special {
>  	{ "AM", date_am },
>  	{ "never", date_never },
>  	{ "now", date_now },
> +	{ "today", date_now },

Hmph, this may not work very well for "git log --since=today", which you may want to stop immediately when the traversal reaches a patch written before the most recent midnight, instead of stopping without giving anything back.

Show 20 quoted lines
>  	{ NULL }
>  };
>  
> diff --git a/t/t0006-date.sh b/t/t0006-date.sh
> index 5d66267672..e01d093514 100755
> --- a/t/t0006-date.sh
> +++ b/t/t0006-date.sh
> @@ -186,8 +186,12 @@ 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 'today at noon' '2009-08-30 12:00:00' success -12
>  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 '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 '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' success +48
Previous: Tuomas AholaNext: Tuomas Ahola
Message 11 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.