# [PATCH 01/34] Documentation/diff-config: fix description of diff.renames 4 messages from 2016-04-03 to 2016-04-03. Participants: Junio C Hamano. Thread: https://gitlist.dev/t/41912 ## Junio C Hamano, 2016-04-03 17:23 Subject: [PATCH 01/34] Documentation/diff-config: fix description of diff.renames Message-ID: <1459704240-28792-1-git-send-email-gitster@pobox.com> URL: https://gitlist.dev/e/1459704240-28792-1-git-send-email-gitster%40pobox.com ``` From: Matthieu Moy The description was misleading, since "set to any boolean value" include "set to false", and diff.renames=false does not enable basic detection, but actually disables it. Also, document that diff.renames only affects Porcelain. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- Documentation/diff-config.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 6eaa452..cf4a915 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -108,9 +108,13 @@ diff.renameLimit:: detection; equivalent to the 'git diff' option '-l'. diff.renames:: - Tells Git to detect renames. If set to any boolean value, it - will enable basic rename detection. If set to "copies" or - "copy", it will detect copies, as well. + Whether and how Git detects renames. If set to "false", + rename detection is disabled. If set to "true", basic rename + detection is enabled. If set to "copies" or "copy", Git will + detect copies, as well. Defaults to false. Note that this + affects only 'git diff' Porcelain like linkgit:git-diff[1] and + linkgit:git-log[1], and not lower level commands such as + linkgit:git-diff-files[1]. diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space -- 2.8.0-246-g1783343 ``` ## Junio C Hamano, 2016-04-03 17:23 Subject: [PATCH 02/34] t4001-diff-rename: wrap file creations in a test Message-ID: <1459704240-28792-2-git-send-email-gitster@pobox.com> URL: https://gitlist.dev/e/1459704240-28792-2-git-send-email-gitster%40pobox.com In-Reply-To: <1459704240-28792-1-git-send-email-gitster@pobox.com> ``` From: Matthieu Moy Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- t/t4001-diff-rename.sh | 66 ++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 2f327b7..06b8828 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -9,21 +9,40 @@ test_description='Test rename detection in diff engine. . ./test-lib.sh . "$TEST_DIRECTORY"/diff-lib.sh -echo >path0 '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 +test_expect_success 'setup' ' + cat >path0 <<-\EOF && + 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 + cat >expected <<-\EOF + diff --git a/path0 b/path1 + rename from path0 + rename to path1 + --- a/path0 + +++ b/path1 + @@ -8,7 +8,7 @@ Line 7 + Line 8 + Line 9 + Line 10 + -line 11 + +Line 11 + Line 12 + Line 13 + Line 14 + EOF ' test_expect_success \ @@ -43,22 +62,7 @@ test_expect_success \ test_expect_success \ 'git diff-index -p -M after rename and editing.' \ 'git diff-index -p -M $tree >current' -cat >expected <<\EOF -diff --git a/path0 b/path1 -rename from path0 -rename to path1 ---- a/path0 -+++ b/path1 -@@ -8,7 +8,7 @@ Line 7 - Line 8 - Line 9 - Line 10 --line 11 -+Line 11 - Line 12 - Line 13 - Line 14 -EOF + test_expect_success \ 'validate the output.' \ -- 2.8.0-246-g1783343 ``` ## Junio C Hamano, 2016-04-03 17:25 Subject: Re: [PATCH 01/34] Documentation/diff-config: fix description of diff.renames Message-ID: URL: https://gitlist.dev/e/xmqqoa9qfvts.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1459704240-28792-1-git-send-email-gitster@pobox.com> ``` Sorry, please ignore (I had two similarly named scripts, one drives git-send-email, the other drives something entirely different, and mistakenly invoked the former when I meant to run the latter). ``` ## Junio C Hamano, 2016-04-03 17:26 Subject: Re: [PATCH 02/34] t4001-diff-rename: wrap file creations in a test Message-ID: URL: https://gitlist.dev/e/xmqqk2kefvtj.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1459704240-28792-2-git-send-email-gitster@pobox.com> ``` Sorry, please ignore (I had two similarly named scripts, one drives git-send-email, the other drives something entirely different, and mistakenly invoked the former when I meant to run the latter). ```