# [PATCH] diff: --indent-heuristic is no longer experimental 5 messages from 2017-10-29 to 2017-11-01. Participants: Carlos Martín Nieto, Stefan Beller, Junio C Hamano. Thread: https://gitlist.dev/t/47062 ## Carlos Martín Nieto, 2017-10-29 15:12 Subject: [PATCH] diff: --indent-heuristic is no longer experimental Message-ID: <20171029151228.607834-1-cmn@dwim.me> URL: https://gitlist.dev/e/20171029151228.607834-1-cmn%40dwim.me ``` This heuristic has been the default since 2.14 so we should not confuse our users by saying that it's experimental and off by default. Signed-off-by: Carlos Martín Nieto --- Documentation/diff-heuristic-options.txt | 5 ----- Documentation/diff-options.txt | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 Documentation/diff-heuristic-options.txt diff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt deleted file mode 100644 index d4f3d95505..0000000000 --- a/Documentation/diff-heuristic-options.txt +++ /dev/null @@ -1,5 +0,0 @@ ---indent-heuristic:: ---no-indent-heuristic:: - These are to help debugging and tuning experimental heuristics - (which are off by default) that shift diff hunk boundaries to - make patches easier to read. diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index a88c76741e..dd0dba5b1d 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -63,7 +63,12 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] -include::diff-heuristic-options.txt[] +--indent-heuristic:: + Enable the heuristic that shift diff hunk boundaries to make patches + easier to read. This is the default. + +--no-indent-heuristic:: + Disable the indent heuristic. --minimal:: Spend extra time to make sure the smallest possible -- 2.15.0.rc2 ``` ## Stefan Beller, 2017-10-30 17:40 Subject: Re: [PATCH] diff: --indent-heuristic is no longer experimental Message-ID: URL: https://gitlist.dev/e/CAGZ79kb5-6_jQmEqiX4cb%2BGQzOqCcS8Fqw7Wu4D2YPdmx83pxQ%40mail.gmail.com In-Reply-To: <20171029151228.607834-1-cmn@dwim.me> ``` On Sun, Oct 29, 2017 at 8:12 AM, Carlos Martín Nieto wrote: > This heuristic has been the default since 2.14 so we should not confuse our > users by saying that it's experimental and off by default. > > Signed-off-by: Carlos Martín Nieto Looks good to me, Thanks, Stefan ``` ## Junio C Hamano, 2017-10-31 05:24 Subject: Re: [PATCH] diff: --indent-heuristic is no longer experimental Message-ID: URL: https://gitlist.dev/e/xmqq375z28ld.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20171029151228.607834-1-cmn@dwim.me> ``` Carlos Martín Nieto writes: > This heuristic has been the default since 2.14 so we should not confuse our > users by saying that it's experimental and off by default. > > Signed-off-by: Carlos Martín Nieto > --- Good eyes. Nobody raised noises since this happened at 2.14 until now, so this could wait until the next cycle, though ;-) > Documentation/diff-heuristic-options.txt | 5 ----- > Documentation/diff-options.txt | 7 ++++++- > 2 files changed, 6 insertions(+), 6 deletions(-) > delete mode 100644 Documentation/diff-heuristic-options.txt > > diff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt > deleted file mode 100644 > index d4f3d95505..0000000000 > --- a/Documentation/diff-heuristic-options.txt > +++ /dev/null > @@ -1,5 +0,0 @@ > ---indent-heuristic:: > ---no-indent-heuristic:: > - These are to help debugging and tuning experimental heuristics > - (which are off by default) that shift diff hunk boundaries to > - make patches easier to read. > diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt > index a88c76741e..dd0dba5b1d 100644 > --- a/Documentation/diff-options.txt > +++ b/Documentation/diff-options.txt > @@ -63,7 +63,12 @@ ifndef::git-format-patch[] > Synonym for `-p --raw`. > endif::git-format-patch[] > > -include::diff-heuristic-options.txt[] > +--indent-heuristic:: > + Enable the heuristic that shift diff hunk boundaries to make patches > + easier to read. This is the default. > + > +--no-indent-heuristic:: > + Disable the indent heuristic. > > --minimal:: > Spend extra time to make sure the smallest possible ``` ## Junio C Hamano, 2017-10-31 07:15 Subject: Re: [PATCH] diff: --indent-heuristic is no longer experimental Message-ID: URL: https://gitlist.dev/e/xmqq1sljzt2i.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20171029151228.607834-1-cmn@dwim.me> ``` Carlos Martín Nieto writes: > This heuristic has been the default since 2.14 so we should not confuse our > users by saying that it's experimental and off by default. > > Signed-off-by: Carlos Martín Nieto > --- > Documentation/diff-heuristic-options.txt | 5 ----- > Documentation/diff-options.txt | 7 ++++++- > 2 files changed, 6 insertions(+), 6 deletions(-) > delete mode 100644 Documentation/diff-heuristic-options.txt I suspect that this patch is incomplete. The build procedure barfs and dies while making git-annotate.html, claiming that it wants to find diff-heuristic-options.txt that no longer exists. I'll have to redo today's integration cycle again without this patch. Sigh... ``` ## Junio C Hamano, 2017-11-01 06:14 Subject: Re: [PATCH] diff: --indent-heuristic is no longer experimental Message-ID: URL: https://gitlist.dev/e/xmqqk1zattj7.fsf%40gitster.mtv.corp.google.com In-Reply-To: ``` Junio C Hamano writes: > Carlos Martín Nieto writes: > >> This heuristic has been the default since 2.14 so we should not confuse our >> users by saying that it's experimental and off by default. >> >> Signed-off-by: Carlos Martín Nieto >> --- >> Documentation/diff-heuristic-options.txt | 5 ----- >> Documentation/diff-options.txt | 7 ++++++- >> 2 files changed, 6 insertions(+), 6 deletions(-) >> delete mode 100644 Documentation/diff-heuristic-options.txt > > I suspect that this patch is incomplete. The build procedure barfs > and dies while making git-annotate.html, claiming that it wants to > find diff-heuristic-options.txt that no longer exists. The fix is obvious once you have time to sip your tea and look at the output from "git grep" ;-) Subject: [PATCH] SQUASH??? --- Documentation/git-annotate.txt | 1 - Documentation/git-blame.txt | 2 -- 2 files changed, 3 deletions(-) diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt index 94be4b85e0..05fd482b74 100644 --- a/Documentation/git-annotate.txt +++ b/Documentation/git-annotate.txt @@ -23,7 +23,6 @@ familiar command name for people coming from other SCM systems. OPTIONS ------- include::blame-options.txt[] -include::diff-heuristic-options.txt[] SEE ALSO -------- diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index fdc3aea30a..16323eb80e 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -89,8 +89,6 @@ include::blame-options.txt[] abbreviated object name, use +1 digits. Note that 1 column is used for a caret to mark the boundary commit. -include::diff-heuristic-options.txt[] - THE PORCELAIN FORMAT -------------------- -- 2.15.0-206-g5fb43f7f39 ```