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

[PATCH v1 4/7] test: add various tests for diff formats with -s

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 12, 2023, 08:03 UTC
Message-ID
<20230512080339.2186324-5-felipe.contreras@gmail.com>
In-Reply-To
<20230512080339.2186324-1-felipe.contreras@gmail.com>

There used to be a bug when -s was used with different formats, for example `-s --raw`.

Originally-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 t/t4000-diff-format.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index bfcaae390f..7829cc810d 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -91,4 +91,23 @@ test_expect_success 'git diff-files --patch --no-patch does not show the patch'
 	test_must_be_empty err
 '
 
+
+echo 'reset' >path1
+
+for format in stat raw numstat shortstat summary dirstat cumulative \
+	dirstat-by-file patch-with-raw patch-with-stat compact-summary
+do
+	test_expect_success "-s before --$format' is a no-op" '
+		git diff-files -s "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "-s clears --$format" '
+		git diff-files --$format -s --patch >actual &&
+		git diff-files --patch >expect &&
+		test_cmp expect actual
+	'
+done
+
 test_done
-- 
2.40.0+fc1
Previous: Felipe ContrerasNext: Felipe Contreras
Message 5 of 10 in “diff: fix -s and --no-patch”
  1. 0/7 diff: fix -s and --no-patchFelipe Contreras, May 12, 2023
  2. 1/7 line-log: set patch format explicitly by defaultFelipe Contreras, May 12, 2023
  3. 2/7 diff: introduce DIFF_FORMAT_DEFAULTFelipe Contreras, May 12, 2023
  4. 3/7 diff: make DIFF_FORMAT_NO_OUTPUT 0Felipe Contreras, May 12, 2023
  5. 4/7 test: add various tests for diff formats with -sFelipe Contreras, May 12, 2023
  6. 5/7 diff: split --no-patch from -sFelipe Contreras, May 12, 2023
  7. 6/7 diff: add --silent as alias of -sFelipe Contreras, May 12, 2023
  8. 7/7 diff: remove DIFF_FORMAT_NO_OUTPUTFelipe Contreras, May 12, 2023
  9. Felipe ContrerasMay 12, 2023
  10. Sergey OrganovMay 12, 2023

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.