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

[PATCH 1/5] t4212: test bogus timestamps with git-log

From
Jeff King <peff@peff.net>
Date
Feb 24, 2014, 07:36 UTC
Message-ID
<20140224073622.GA9969@sigill.intra.peff.net>
In-Reply-To
<20140224073348.GA20221@sigill.intra.peff.net>

When t4212 was originally added by 9dbe7c3d (pretty: handle broken commit headers gracefully, 2013-04-17), it tested our handling of commits with broken ident lines in which the timestamps could not be parsed. It does so using a bogus line like "Name <email>-<> 1234 -0000", because that simulates an error that was seen in the wild.

Later, 03818a4 (split_ident: parse timestamp from end of line, 2013-10-14) made our parser smart enough to actually find the timestamp on such a line, and t4212 was adjusted to match. While it's nice that we handle this real-world case, this meant that we were not actually testing the bogus-timestamp case anymore.

This patch adds a test with a totally incomprehensible timestamp to make sure we are testing the code path.

Note that the behavior is slightly different between regular log output and "--format=%ad". In the former case, we produce a sentinel value and in the latter, we produce an empty string. While at first this seems unnecessarily inconsistent, it matches the original behavior given by 9dbe7c3d.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t4212-log-corrupt.sh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh
index 93c7c36..83de981 100755
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@ -44,4 +44,25 @@ test_expect_success 'git log --format with broken author email' '
 	test_cmp expect.err actual.err
 '
 
+munge_author_date () {
+	git cat-file commit "$1" >commit.orig &&
+	sed "s/^\(author .*>\) [0-9]*/\1 $2/" <commit.orig >commit.munge &&
+	git hash-object -w -t commit commit.munge
+}
+
+test_expect_success 'unparsable dates produce sentinel value' '
+	commit=$(munge_author_date HEAD totally_bogus) &&
+	echo "Date:   Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 $commit >actual.full &&
+	grep Date <actual.full >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'unparsable dates produce sentinel value (%ad)' '
+	commit=$(munge_author_date HEAD totally_bogus) &&
+	echo >expect &&
+	git log -1 --format=%ad $commit >actual
+	test_cmp expect actual
+'
+
 test_done
-- 
1.8.5.2.500.g8060133
Previous: Jeff KingNext: Jeff King
Message 2 of 48 in “handle bogus commit dates”
  1. 0/5 handle bogus commit datesJeff King, Feb 24, 2014
  2. 1/5 t4212: test bogus timestamps with git-logJeff King, Feb 24, 2014
  3. 2/5 fsck: report integer overflow in author timestampsJeff King, Feb 24, 2014
  4. 3/5 date: check date overflow against time_tJeff King, Feb 24, 2014
  5. 4/5 log: handle integer overflow in timestampsJeff King, Feb 24, 2014
  6. Junio C HamanoFeb 24, 2014
  7. Jeff KingFeb 24, 2014
  8. Junio C HamanoFeb 24, 2014
  9. Jeff KingFeb 24, 2014
  10. Junio C HamanoFeb 24, 2014
  11. 5/5 log: do not segfault on gmtime errorsJeff King, Feb 24, 2014
  12. René ScharfeMar 22, 2014
  13. Jeff KingMar 24, 2014
  14. René ScharfeMar 24, 2014
  15. Jeff KingMar 24, 2014
  16. Charles BaileyMar 26, 2014
  17. Jeff KingMar 26, 2014
  18. t4212: handle systems with post-apocalyptic gmtimeJeff King, Mar 26, 2014
  19. Junio C HamanoMar 26, 2014
  20. Jeff KingMar 26, 2014
  21. Jeff KingMar 26, 2014
  22. Jeff KingMar 26, 2014
  23. Charles BaileyMar 26, 2014
  24. Jeff KingMar 26, 2014
  25. Charles BaileyMar 26, 2014
  26. Charles BaileyMar 26, 2014
  27. Jeff KingMar 26, 2014
  28. Charles BaileyMar 26, 2014
  29. Jeff KingMar 27, 2014
  30. Junio C HamanoMar 28, 2014
  31. Jeff KingMar 28, 2014
  32. Junio C HamanoMar 28, 2014
  33. Jeff KingMar 28, 2014
  34. Junio C HamanoMar 28, 2014
  35. Jeff KingApr 1, 2014
  36. 1/2 date: recognize bogus FreeBSD gmtime outputJeff King, Apr 1, 2014
  37. René ScharfeApr 1, 2014
  38. Junio C HamanoApr 1, 2014
  39. René ScharfeApr 1, 2014
  40. Jeff KingApr 1, 2014
  41. 2/2 t4212: loosen far-in-future test for AIXJeff King, Apr 1, 2014
  42. work around unreliable gmtime errors on AIXJeff King, Apr 1, 2014
  43. Junio C HamanoApr 1, 2014
  44. Jeff KingApr 1, 2014
  45. Junio C HamanoMar 26, 2014
  46. Jeff KingMar 26, 2014
  47. Junio C HamanoMar 26, 2014
  48. Jeff KingMar 26, 2014

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.