On 2017-04-29 09:14 AM, Jeff King wrote:
> On Sat, Apr 29, 2017 at 08:40:52AM -0400, Jeff King wrote:
>
>> On Fri, Apr 28, 2017 at 06:33:12PM -0400, Marc Branchaud wrote:
>>
>>> v2: Fixed up the commit messages and added tests.
>>>
>>> Marc Branchaud (2):
>>> diff: make the indent heuristic part of diff's basic configuration
>>> diff: have the diff-* builtins configure diff before initializing
>>> revisions
>>>
>>> Stefan Beller (1):
>>> diff: enable indent heuristic by default
>>
>> Thanks, these look fine to me. I'd like to get an ACK from Michael, in
>> case he had some other reason for omitting them from git_diff_ui_config
>> (from my recollection, it's probably just a mix of conservatism and
>> following what the compaction heuristic had done).
>
> Sorry, I spoke too soon. The third one needs a few test adjustments
> squashed in to pass the tests.
Doh! That'll teach me to try to do this stuff at the end of a Friday...
One more try, then:
Changes since v2:
Patch 1/4 : Unchanged.
Patch 2/4 : Mentioned how the new behaviour matches the diff Porcelain.
Patch 3/4 : Updated the tests.
Patch 4/4 : (New) Jeff's add--interactive patch.
Thanks for all the help, Jeff!
M.
Jeff King (1):
add--interactive: drop diff.indentHeuristic handling
Marc Branchaud (2):
diff: make the indent heuristic part of diff's basic configuration
diff: have the diff-* builtins configure diff before initializing
revisions
Stefan Beller (1):
diff: enable indent heuristic by default
builtin/diff-files.c | 2 +-
builtin/diff-index.c | 2 +-
builtin/diff-tree.c | 2 +-
diff.c | 8 ++---
git-add--interactive.perl | 4 ---
t/t4051-diff-function-context.sh | 3 +-
t/t4061-diff-indent.sh | 72 ++++++++++++++++++++++++++++++++++++++--
7 files changed, 78 insertions(+), 15 deletions(-)
--
2.13.0.rc1.15.gf67d331ad