diff:add option to ignore blank line changes

yuuri · yuuri · commit ed94f54940fe · 2021-05-01T20:26:49.000+08:00
diff --git 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
@@ -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
@@ -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;
 }

-Original file line number
+Diff line change
 /tags
 CMakeSettings.json
 .vs
 +.idea
Original file line number	Diff line number	Diff line change
`@@ -259,5 +259,8 @@ void git_xdiff_init(git_xdiff_output xo, const git_diff_options opts)`
`259`	`259`	`if (flags & GIT_DIFF_MINIMAL)`
`260`	`260`	`xo->params.flags \|= XDF_NEED_MINIMAL;`
`261`	`261`
	`262`	`+ if (flags & GIT_DIFF_IGNORE_BLANK_LINES)`
	`263`	`+ xo->params.flags \|= XDF_IGNORE_BLANK_LINES;`
	`264`	`+`
`262`	`265`	`xo->callback.outf = git_xdiff_cb;`
`263`	`266`	`}`