diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2017-11-03 13:25:04 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2017-11-03 13:28:33 +0100 |
| commit | 7de843f49a79cc396f86147c80d542b1c3fd4608 (patch) | |
| tree | b9dbbd4911431093c2c77dd634f8054f5308764e /src | |
| parent | 9601f7efda180a78c02f89a69a5cfad43cd8bd36 (diff) | |
| download | libgit2-7de843f49a79cc396f86147c80d542b1c3fd4608.tar.gz | |
diff: enable the indent heuristic by default
The diff option is now reversed and can be used to get back to the previous
form.
Diffstat (limited to 'src')
| -rw-r--r-- | src/diff_xdiff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/diff_xdiff.c b/src/diff_xdiff.c index 701eb1b5f..b101b0741 100644 --- a/src/diff_xdiff.c +++ b/src/diff_xdiff.c @@ -233,14 +233,16 @@ void git_xdiff_init(git_xdiff_output *xo, const git_diff_options *opts) xo->config.ctxlen = opts ? opts->context_lines : 3; xo->config.interhunkctxlen = opts ? opts->interhunk_lines : 0; + xo->params.flags |= XDF_INDENT_HEURISTIC; + if (flags & GIT_DIFF_IGNORE_WHITESPACE) xo->params.flags |= XDF_WHITESPACE_FLAGS; if (flags & GIT_DIFF_IGNORE_WHITESPACE_CHANGE) xo->params.flags |= XDF_IGNORE_WHITESPACE_CHANGE; if (flags & GIT_DIFF_IGNORE_WHITESPACE_EOL) xo->params.flags |= XDF_IGNORE_WHITESPACE_AT_EOL; - if (flags & GIT_DIFF_INDENT_HEURISTIC) - xo->params.flags |= XDF_INDENT_HEURISTIC; + if (flags & GIT_DIFF_DISABLE_INDENT_HEURISTIC) + xo->params.flags &= ~XDF_INDENT_HEURISTIC; if (flags & GIT_DIFF_PATIENCE) xo->params.flags |= XDF_PATIENCE_DIFF; |