{"thread":{"id":"47062","subject":"[PATCH] diff: --indent-heuristic is no longer experimental","startedAt":"2017-10-29T15:12:36Z","lastAt":"2017-11-01T06:14:29Z","messageCount":5,"participants":["Carlos Martín Nieto","Stefan Beller","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"331271","messageId":"20171029151228.607834-1-cmn@dwim.me","threadId":"47062","inReplyTo":null,"subject":"[PATCH] diff: --indent-heuristic is no longer experimental","fromName":"Carlos Martín Nieto","fromEmail":"cmn@dwim.me","sentAt":"2017-10-29T15:12:28Z","receivedAt":"2017-10-29T15:12:36Z","isPatch":true,"sender":{"key":"cmn@dwim.me","avatar":"https://avatars.githubusercontent.com/u/335443?v=4"},"body":"This heuristic has been the default since 2.14 so we should not confuse our\nusers by saying that it's experimental and off by default.\n\nSigned-off-by: Carlos Martín Nieto \n---\n Documentation/diff-heuristic-options.txt | 5 -----\n Documentation/diff-options.txt | 7 ++++++-\n 2 files changed, 6 insertions(+), 6 deletions(-)\n delete mode 100644 Documentation/diff-heuristic-options.txt\n\ndiff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt\ndeleted file mode 100644\nindex d4f3d95505..0000000000\n--- a/Documentation/diff-heuristic-options.txt\n+++ /dev/null\n@@ -1,5 +0,0 @@\n---indent-heuristic::\n---no-indent-heuristic::\n-\tThese are to help debugging and tuning experimental heuristics\n-\t(which are off by default) that shift diff hunk boundaries to\n-\tmake patches easier to read.\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex a88c76741e..dd0dba5b1d 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -63,7 +63,12 @@ ifndef::git-format-patch[]\n \tSynonym for `-p --raw`.\n endif::git-format-patch[]\n \n-include::diff-heuristic-options.txt[]\n+--indent-heuristic::\n+\tEnable the heuristic that shift diff hunk boundaries to make patches\n+\teasier to read. This is the default.\n+\n+--no-indent-heuristic::\n+\tDisable the indent heuristic.\n \n --minimal::\n \tSpend extra time to make sure the smallest possible\n-- \n2.15.0.rc2\n\n"},{"id":"331392","messageId":"CAGZ79kb5-6_jQmEqiX4cb+GQzOqCcS8Fqw7Wu4D2YPdmx83pxQ@mail.gmail.com","threadId":"47062","inReplyTo":"20171029151228.607834-1-cmn@dwim.me","subject":"Re: [PATCH] diff: --indent-heuristic is no longer experimental","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2017-10-30T17:40:04Z","receivedAt":"2017-10-30T17:40:10Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Sun, Oct 29, 2017 at 8:12 AM, Carlos Martín Nieto wrote:\n> This heuristic has been the default since 2.14 so we should not confuse our\n> users by saying that it's experimental and off by default.\n>\n> Signed-off-by: Carlos Martín Nieto \n\nLooks good to me,\n\nThanks,\nStefan\n"},{"id":"331454","messageId":"xmqq375z28ld.fsf@gitster.mtv.corp.google.com","threadId":"47062","inReplyTo":"20171029151228.607834-1-cmn@dwim.me","subject":"Re: [PATCH] diff: --indent-heuristic is no longer experimental","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-10-31T05:24:14Z","receivedAt":"2017-10-31T05:24:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Carlos Martín Nieto writes:\n\n> This heuristic has been the default since 2.14 so we should not confuse our\n> users by saying that it's experimental and off by default.\n>\n> Signed-off-by: Carlos Martín Nieto \n> ---\n\nGood eyes. Nobody raised noises since this happened at 2.14 until\nnow, so this could wait until the next cycle, though ;-)\n\n> Documentation/diff-heuristic-options.txt | 5 -----\n> Documentation/diff-options.txt | 7 ++++++-\n> 2 files changed, 6 insertions(+), 6 deletions(-)\n> delete mode 100644 Documentation/diff-heuristic-options.txt\n>\n> diff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt\n> deleted file mode 100644\n> index d4f3d95505..0000000000\n> --- a/Documentation/diff-heuristic-options.txt\n> +++ /dev/null\n> @@ -1,5 +0,0 @@\n> ---indent-heuristic::\n> ---no-indent-heuristic::\n> -\tThese are to help debugging and tuning experimental heuristics\n> -\t(which are off by default) that shift diff hunk boundaries to\n> -\tmake patches easier to read.\n> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\n> index a88c76741e..dd0dba5b1d 100644\n> --- a/Documentation/diff-options.txt\n> +++ b/Documentation/diff-options.txt\n> @@ -63,7 +63,12 @@ ifndef::git-format-patch[]\n> \tSynonym for `-p --raw`.\n> endif::git-format-patch[]\n> \n> -include::diff-heuristic-options.txt[]\n> +--indent-heuristic::\n> +\tEnable the heuristic that shift diff hunk boundaries to make patches\n> +\teasier to read. This is the default.\n> +\n> +--no-indent-heuristic::\n> +\tDisable the indent heuristic.\n> \n> --minimal::\n> \tSpend extra time to make sure the smallest possible\n"},{"id":"331462","messageId":"xmqq1sljzt2i.fsf@gitster.mtv.corp.google.com","threadId":"47062","inReplyTo":"20171029151228.607834-1-cmn@dwim.me","subject":"Re: [PATCH] diff: --indent-heuristic is no longer experimental","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-10-31T07:15:33Z","receivedAt":"2017-10-31T07:15:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Carlos Martín Nieto writes:\n\n> This heuristic has been the default since 2.14 so we should not confuse our\n> users by saying that it's experimental and off by default.\n>\n> Signed-off-by: Carlos Martín Nieto \n> ---\n> Documentation/diff-heuristic-options.txt | 5 -----\n> Documentation/diff-options.txt | 7 ++++++-\n> 2 files changed, 6 insertions(+), 6 deletions(-)\n> delete mode 100644 Documentation/diff-heuristic-options.txt\n\nI suspect that this patch is incomplete. The build procedure barfs\nand dies while making git-annotate.html, claiming that it wants to\nfind diff-heuristic-options.txt that no longer exists.\n\nI'll have to redo today's integration cycle again without this\npatch. Sigh...\n\n\n"},{"id":"331546","messageId":"xmqqk1zattj7.fsf@gitster.mtv.corp.google.com","threadId":"47062","inReplyTo":"xmqq1sljzt2i.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] diff: --indent-heuristic is no longer experimental","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-11-01T06:14:20Z","receivedAt":"2017-11-01T06:14:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Carlos Martín Nieto writes:\n>\n>> This heuristic has been the default since 2.14 so we should not confuse our\n>> users by saying that it's experimental and off by default.\n>>\n>> Signed-off-by: Carlos Martín Nieto \n>> ---\n>> Documentation/diff-heuristic-options.txt | 5 -----\n>> Documentation/diff-options.txt | 7 ++++++-\n>> 2 files changed, 6 insertions(+), 6 deletions(-)\n>> delete mode 100644 Documentation/diff-heuristic-options.txt\n>\n> I suspect that this patch is incomplete. The build procedure barfs\n> and dies while making git-annotate.html, claiming that it wants to\n> find diff-heuristic-options.txt that no longer exists.\n\nThe fix is obvious once you have time to sip your tea and look at\nthe output from \"git grep\" ;-)\n\nSubject: [PATCH] SQUASH???\n\n---\n Documentation/git-annotate.txt | 1 -\n Documentation/git-blame.txt | 2 --\n 2 files changed, 3 deletions(-)\n\ndiff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt\nindex 94be4b85e0..05fd482b74 100644\n--- a/Documentation/git-annotate.txt\n+++ b/Documentation/git-annotate.txt\n@@ -23,7 +23,6 @@ familiar command name for people coming from other SCM systems.\n OPTIONS\n -------\n include::blame-options.txt[]\n-include::diff-heuristic-options.txt[]\n \n SEE ALSO\n --------\ndiff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\nindex fdc3aea30a..16323eb80e 100644\n--- a/Documentation/git-blame.txt\n+++ b/Documentation/git-blame.txt\n@@ -89,8 +89,6 @@ include::blame-options.txt[]\n \tabbreviated object name, use +1 digits. Note that 1 column\n \tis used for a caret to mark the boundary commit.\n \n-include::diff-heuristic-options.txt[]\n-\n \n THE PORCELAIN FORMAT\n --------------------\n-- \n2.15.0-206-g5fb43f7f39\n\n"}]}