diff options
| author | yuuri <houjie95@foxmail.com> | 2021-05-01 20:26:49 +0800 |
|---|---|---|
| committer | yuuri <houjie95@foxmail.com> | 2021-05-01 20:26:49 +0800 |
| commit | ed94f54940fed8c7e9882c222b4791140bc209ba (patch) | |
| tree | 3fe88d72819ce79ac0a20193e4ca9aced9ec74e8 | |
| parent | cabfa3b30cfae24ec6d7d75c5cf052e052cbf131 (diff) | |
| download | libgit2-ed94f54940fed8c7e9882c222b4791140bc209ba.tar.gz | |
diff:add option to ignore blank line changes
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | include/git2/diff.h | 4 | ||||
| -rw-r--r-- | src/diff_xdiff.c | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 69d388f8e..1b482f038 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /tags CMakeSettings.json .vs +.idea diff --git a/include/git2/diff.h b/include/git2/diff.h index e10555595..c63d93dc8 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -168,6 +168,10 @@ typedef enum { * can apply given diff information to binary files. */ GIT_DIFF_SHOW_BINARY = (1u << 30), + + /** Ignore blank lines */ + GIT_DIFF_IGNORE_BLANK_LINES = (1u << 31), + } git_diff_option_t; /** diff --git a/src/diff_xdiff.c b/src/diff_xdiff.c index c4668fa2f..7a32ea43f 100644 --- a/src/diff_xdiff.c +++ b/src/diff_xdiff.c @@ -259,5 +259,8 @@ void git_xdiff_init(git_xdiff_output *xo, const git_diff_options *opts) if (flags & GIT_DIFF_MINIMAL) xo->params.flags |= XDF_NEED_MINIMAL; + if (flags & GIT_DIFF_IGNORE_BLANK_LINES) + xo->params.flags |= XDF_IGNORE_BLANK_LINES; + xo->callback.outf = git_xdiff_cb; } |