{"thread":{"id":"51646","subject":"Is diff.indentHeuristic still experimental?","startedAt":"2019-08-15T04:53:19Z","lastAt":"2019-08-15T16:58:27Z","messageCount":4,"participants":["Hong Xu","SZEDER Gábor","Jeff King","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"380467","messageId":"58aafeaa-72b0-25ce-27b6-f8480fe48b5e@topbug.net","threadId":"51646","inReplyTo":null,"subject":"Is diff.indentHeuristic still experimental?","fromName":"Hong Xu","fromEmail":"hong@topbug.net","sentAt":"2019-08-15T04:38:08Z","receivedAt":"2019-08-15T04:53:19Z","isPatch":false,"sender":{"key":"hong@topbug.net","avatar":null},"body":"Hi all,\n\nI saw that diff.indentHeuristic was enabled by default at\n33de7163879ca83be7d6e1583c125f84e1e7c329\n<https://git.kernel.org/pub/scm/git/git.git/commit/?id=33de7163879ca83be7d6e1583c125f84e1e7c329>\n, but the doc still says it is experimental\n<https://git-scm.com/docs/git-config#Documentation/git-config.txt-diffindentHeuristic>.\nAm I missing anything?\n\n\nBest,\n\nHong\n\nHong\n\n\n"},{"id":"380470","messageId":"20190815091245.16525-1-szeder.dev@gmail.com","threadId":"51646","inReplyTo":"58aafeaa-72b0-25ce-27b6-f8480fe48b5e@topbug.net","subject":"[PATCH] diff: 'diff.indentHeuristic' is no longer experimental","fromName":"SZEDER Gábor","fromEmail":"szeder.dev@gmail.com","sentAt":"2019-08-15T09:12:45Z","receivedAt":"2019-08-15T09:12:51Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"The indent heuristic started out as experimental, but it's now our\ndefault diff heuristic since 33de716387 (diff: enable indent heuristic\nby default, 2017-05-08).  Alas, that commit didn't update the\ndocumentation, and the description of the 'diff.indentHeuristic'\nconfiguration variable still implies that it's experimental and not\nthe default.\n\nUpdate the description of 'diff.indentHeuristic' to make it clear that\nit's the default diff heuristic.\n\nThe description of the related '--indent-heuristic' option has already\nbeen updated in bab76141da (diff: --indent-heuristic is no\nlonger experimental, 2017-10-29).\n\nSigned-off-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n Documentation/config/diff.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt\nindex 5afb5a2cbc..ff09f1cf73 100644\n--- a/Documentation/config/diff.txt\n+++ b/Documentation/config/diff.txt\n@@ -189,7 +189,7 @@ diff.guitool::\n include::../mergetools-diff.txt[]\n \n diff.indentHeuristic::\n-\tSet this option to `true` to enable experimental heuristics\n+\tSet this option to `false` to disable the default heuristics\n \tthat shift diff hunk boundaries to make patches easier to read.\n \n diff.algorithm::\n-- \n2.23.0.rc2.366.g16015fd804\n\n"},{"id":"380472","messageId":"20190815135628.GA27091@sigill.intra.peff.net","threadId":"51646","inReplyTo":"20190815091245.16525-1-szeder.dev@gmail.com","subject":"Re: [PATCH] diff: 'diff.indentHeuristic' is no longer experimental","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-08-15T13:56:28Z","receivedAt":"2019-08-15T13:56:31Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Aug 15, 2019 at 11:12:45AM +0200, SZEDER Gábor wrote:\n\n> The indent heuristic started out as experimental, but it's now our\n> default diff heuristic since 33de716387 (diff: enable indent heuristic\n> by default, 2017-05-08).  Alas, that commit didn't update the\n> documentation, and the description of the 'diff.indentHeuristic'\n> configuration variable still implies that it's experimental and not\n> the default.\n> \n> Update the description of 'diff.indentHeuristic' to make it clear that\n> it's the default diff heuristic.\n> \n> The description of the related '--indent-heuristic' option has already\n> been updated in bab76141da (diff: --indent-heuristic is no\n> longer experimental, 2017-10-29).\n\nYeah, this makes perfect sense.\n\nI wondered briefly if we needed to distinguish between plumbing and\nporcelain here, but the config option (and its default) are the same for\nboth.\n\n-Peff\n"},{"id":"380484","messageId":"xmqqa7ca4b85.fsf@gitster-ct.c.googlers.com","threadId":"51646","inReplyTo":"20190815135628.GA27091@sigill.intra.peff.net","subject":"Re: [PATCH] diff: 'diff.indentHeuristic' is no longer experimental","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-15T16:58:18Z","receivedAt":"2019-08-15T16:58:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Thu, Aug 15, 2019 at 11:12:45AM +0200, SZEDER Gábor wrote:\n>\n>> The indent heuristic started out as experimental, but it's now our\n>> default diff heuristic since 33de716387 (diff: enable indent heuristic\n>> by default, 2017-05-08).  Alas, that commit didn't update the\n>> documentation, and the description of the 'diff.indentHeuristic'\n>> configuration variable still implies that it's experimental and not\n>> the default.\n>> \n>> Update the description of 'diff.indentHeuristic' to make it clear that\n>> it's the default diff heuristic.\n>> \n>> The description of the related '--indent-heuristic' option has already\n>> been updated in bab76141da (diff: --indent-heuristic is no\n>> longer experimental, 2017-10-29).\n>\n> Yeah, this makes perfect sense.\n\nOK.  Thanks, all.\n"}]}