{"thread":{"id":"41912","subject":"[PATCH 01/34] Documentation/diff-config: fix description of diff.renames","startedAt":"2016-04-03T17:23:27Z","lastAt":"2016-04-03T17:26:00Z","messageCount":4,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":34},"messages":[{"id":"282563","messageId":"1459704240-28792-1-git-send-email-gitster@pobox.com","threadId":"41912","inReplyTo":null,"subject":"[PATCH 01/34] Documentation/diff-config: fix description of diff.renames","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-04-03T17:23:27Z","receivedAt":"2016-04-03T17:23:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"From: Matthieu Moy \n\nThe description was misleading, since \"set to any boolean value\" include\n\"set to false\", and diff.renames=false does not enable basic detection,\nbut actually disables it. Also, document that diff.renames only affects\nPorcelain.\n\nSigned-off-by: Matthieu Moy \nSigned-off-by: Junio C Hamano \n---\n Documentation/diff-config.txt | 10 +++++++---\n 1 file changed, 7 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt\nindex 6eaa452..cf4a915 100644\n--- a/Documentation/diff-config.txt\n+++ b/Documentation/diff-config.txt\n@@ -108,9 +108,13 @@ diff.renameLimit::\n \tdetection; equivalent to the 'git diff' option '-l'.\n \n diff.renames::\n-\tTells Git to detect renames. If set to any boolean value, it\n-\twill enable basic rename detection. If set to \"copies\" or\n-\t\"copy\", it will detect copies, as well.\n+\tWhether and how Git detects renames. If set to \"false\",\n+\trename detection is disabled. If set to \"true\", basic rename\n+\tdetection is enabled. If set to \"copies\" or \"copy\", Git will\n+\tdetect copies, as well. Defaults to false. Note that this\n+\taffects only 'git diff' Porcelain like linkgit:git-diff[1] and\n+\tlinkgit:git-log[1], and not lower level commands such as\n+\tlinkgit:git-diff-files[1].\n \n diff.suppressBlankEmpty::\n \tA boolean to inhibit the standard behavior of printing a space\n-- \n2.8.0-246-g1783343\n"},{"id":"282564","messageId":"1459704240-28792-2-git-send-email-gitster@pobox.com","threadId":"41912","inReplyTo":"1459704240-28792-1-git-send-email-gitster@pobox.com","subject":"[PATCH 02/34] t4001-diff-rename: wrap file creations in a test","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-04-03T17:23:28Z","receivedAt":"2016-04-03T17:23:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"From: Matthieu Moy \n\nSigned-off-by: Matthieu Moy \nSigned-off-by: Junio C Hamano \n---\n t/t4001-diff-rename.sh | 66 ++++++++++++++++++++++++++------------------------\n 1 file changed, 35 insertions(+), 31 deletions(-)\n\ndiff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh\nindex 2f327b7..06b8828 100755\n--- a/t/t4001-diff-rename.sh\n+++ b/t/t4001-diff-rename.sh\n@@ -9,21 +9,40 @@ test_description='Test rename detection in diff engine.\n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/diff-lib.sh\n \n-echo >path0 'Line 1\n-Line 2\n-Line 3\n-Line 4\n-Line 5\n-Line 6\n-Line 7\n-Line 8\n-Line 9\n-Line 10\n-line 11\n-Line 12\n-Line 13\n-Line 14\n-Line 15\n+test_expect_success 'setup' '\n+\tcat >path0 <<-\\EOF &&\n+\tLine 1\n+\tLine 2\n+\tLine 3\n+\tLine 4\n+\tLine 5\n+\tLine 6\n+\tLine 7\n+\tLine 8\n+\tLine 9\n+\tLine 10\n+\tline 11\n+\tLine 12\n+\tLine 13\n+\tLine 14\n+\tLine 15\n+\tEOF\n+\tcat >expected <<-\\EOF\n+\tdiff --git a/path0 b/path1\n+\trename from path0\n+\trename to path1\n+\t--- a/path0\n+\t+++ b/path1\n+\t@@ -8,7 +8,7 @@ Line 7\n+\t Line 8\n+\t Line 9\n+\t Line 10\n+\t-line 11\n+\t+Line 11\n+\t Line 12\n+\t Line 13\n+\t Line 14\n+\tEOF\n '\n \n test_expect_success \\\n@@ -43,22 +62,7 @@ test_expect_success \\\n test_expect_success \\\n 'git diff-index -p -M after rename and editing.' \\\n 'git diff-index -p -M $tree >current'\n-cat >expected <<\\EOF\n-diff --git a/path0 b/path1\n-rename from path0\n-rename to path1\n---- a/path0\n-+++ b/path1\n-@@ -8,7 +8,7 @@ Line 7\n- Line 8\n- Line 9\n- Line 10\n--line 11\n-+Line 11\n- Line 12\n- Line 13\n- Line 14\n-EOF\n+\n \n test_expect_success \\\n 'validate the output.' \\\n-- \n2.8.0-246-g1783343\n"},{"id":"282565","messageId":"xmqqoa9qfvts.fsf@gitster.mtv.corp.google.com","threadId":"41912","inReplyTo":"1459704240-28792-1-git-send-email-gitster@pobox.com","subject":"Re: [PATCH 01/34] Documentation/diff-config: fix description of diff.renames","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-04-03T17:25:51Z","receivedAt":"2016-04-03T17:25:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sorry, please ignore (I had two similarly named scripts, one drives\ngit-send-email, the other drives something entirely different, and\nmistakenly invoked the former when I meant to run the latter).\n"},{"id":"282566","messageId":"xmqqk2kefvtj.fsf@gitster.mtv.corp.google.com","threadId":"41912","inReplyTo":"1459704240-28792-2-git-send-email-gitster@pobox.com","subject":"Re: [PATCH 02/34] t4001-diff-rename: wrap file creations in a test","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-04-03T17:26:00Z","receivedAt":"2016-04-03T17:26:00Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sorry, please ignore (I had two similarly named scripts, one drives\ngit-send-email, the other drives something entirely different, and\nmistakenly invoked the former when I meant to run the latter).\n"}]}