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

[PATCH 3/5] t: add tests for diff.renames (true/false/unset)

From
Matthieu Moy <matthieu.moy@imag.fr>
Date
Feb 23, 2016, 17:44 UTC
Message-ID
<1456249498-3232-4-git-send-email-Matthieu.Moy@imag.fr>
In-Reply-To
<1456249498-3232-1-git-send-email-Matthieu.Moy@imag.fr>

The underlying machinery is well-tested, but the configuration option itself was tested only in t3400-rebase.sh.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
 t/t4001-diff-rename.sh | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index bfb364c..6844906 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -27,7 +27,7 @@ Line 13
 Line 14
 Line 15
 EOF
-	cat >expected <<\EOF
+	cat >expected <<\EOF &&
 diff --git a/path0 b/path1
 rename from path0
 rename to path1
@@ -43,6 +43,50 @@ rename to path1
  Line 13
  Line 14
 EOF
+	cat >no-rename <<\EOF
+diff --git a/path0 b/path0
+deleted file mode 100644
+index fdbec44..0000000
+--- a/path0
++++ /dev/null
+@@ -1,15 +0,0 @@
+-Line 1
+-Line 2
+-Line 3
+-Line 4
+-Line 5
+-Line 6
+-Line 7
+-Line 8
+-Line 9
+-Line 10
+-line 11
+-Line 12
+-Line 13
+-Line 14
+-Line 15
+diff --git a/path1 b/path1
+new file mode 100644
+index 0000000..752c50e
+--- /dev/null
++++ b/path1
+@@ -0,0 +1,15 @@
++Line 1
++Line 2
++Line 3
++Line 4
++Line 5
++Line 6
++Line 7
++Line 8
++Line 9
++Line 10
++Line 11
++Line 12
++Line 13
++Line 14
++Line 15
+EOF
 '
 
 test_expect_success \
@@ -68,6 +112,21 @@ test_expect_success \
     'validate the output.' \
     'compare_diff_patch current expected'
 
+test_expect_success 'test diff.renames=true' '
+	git -c diff.renames=true diff --cached $tree >current &&
+	compare_diff_patch current expected
+'
+
+test_expect_success 'test diff.renames=false' '
+	git -c diff.renames=false diff --cached $tree >current &&
+	compare_diff_patch current no-rename
+'
+
+test_expect_success 'test diff.renames unset' '
+	git diff --cached $tree >current &&
+	compare_diff_patch current no-rename
+'
+
 test_expect_success 'favour same basenames over different ones' '
 	cp path1 another-path &&
 	git add another-path &&
-- 
2.7.2.334.g35ed2ae.dirty
Previous: Matthieu MoyNext: Matthieu Moy
Message 9 of 29 in “activate diff.renames by default”
  1. 0/5 activate diff.renames by defaultMatthieu Moy, Feb 23, 2016
  2. 1/5 Documentation/diff-config: fix description of diff.renamesMatthieu Moy, Feb 23, 2016
  3. Jeff KingFeb 24, 2016
  4. Felipe Gonçalves AssisFeb 25, 2016
  5. Matthieu MoyFeb 25, 2016
  6. 2/5 t4001-diff-rename: wrap file creations in a testMatthieu Moy, Feb 23, 2016
  7. Jeff KingFeb 24, 2016
  8. Matthieu MoyFeb 24, 2016
  9. 3/5 t: add tests for diff.renames (true/false/unset)Matthieu Moy, Feb 23, 2016
  10. 4/5 log: introduce init_log_defaults()Matthieu Moy, Feb 23, 2016
  11. 5/5 diff: activate diff.renames by defaultMatthieu Moy, Feb 23, 2016
  12. Junio C HamanoFeb 23, 2016
  13. Matthieu MoyFeb 23, 2016
  14. Jeff KingFeb 24, 2016
  15. Matthieu MoyFeb 25, 2016
  16. Junio C HamanoFeb 23, 2016
  17. Matthieu MoyFeb 23, 2016
  18. Junio C HamanoFeb 23, 2016
  19. 0/5 activate diff.renames by defaultMatthieu Moy, Feb 25, 2016
  20. 1/5 Documentation/diff-config: fix description of diff.renamesMatthieu Moy, Feb 25, 2016
  21. Documentation/diff-config: fix description of diff.renamesMatthieu Moy, Feb 25, 2016
  22. Junio C HamanoFeb 25, 2016
  23. Junio C HamanoFeb 25, 2016
  24. 2/5 t4001-diff-rename: wrap file creations in a testMatthieu Moy, Feb 25, 2016
  25. 3/5 t: add tests for diff.renames (true/false/unset)Matthieu Moy, Feb 25, 2016
  26. 4/5 log: introduce init_log_defaults()Matthieu Moy, Feb 25, 2016
  27. Junio C HamanoFeb 25, 2016
  28. 5/5 diff: activate diff.renames by defaultMatthieu Moy, Feb 25, 2016
  29. Junio C HamanoFeb 25, 2016

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.