Merge branch 'jh/ignorews'

1 files changed, 8 insertions, 3 deletions

diff --git a/shared.c b/shared.c
index 9f7d6a5..b42c2a2 100644
--- a/shared.c
+++ b/shared.c
@@ -266,3 +266,3 @@ int cgit_diff_files(const unsigned char *old_sha1,
                     unsigned long *new_size, int *binary, int context,
-                    linediff_fn fn)
+                    int ignorews, linediff_fn fn)
 {
@@ -293,2 +293,4 @@ int cgit_diff_files(const unsigned char *old_sha1,
         diff_params.flags = XDF_NEED_MINIMAL;
+        if (ignorews)
+                diff_params.flags |= XDF_IGNORE_WHITESPACE;
         emit_params.ctxlen = context > 0 ? context : 3;
@@ -307,3 +309,3 @@ void cgit_diff_tree(const unsigned char *old_sha1,
                     const unsigned char *new_sha1,
-                    filepair_fn fn, const char *prefix)
+                    filepair_fn fn, const char *prefix, int ignorews)
 {
@@ -318,2 +320,4 @@ void cgit_diff_tree(const unsigned char *old_sha1,
         DIFF_OPT_SET(&opt, RECURSIVE);
+        if (ignorews)
+                DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
         opt.format_callback = cgit_diff_tree_cb;
@@ -342,3 +346,4 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
                 old_sha1 = commit->parents->item->object.sha1;
-        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
+        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
+                       ctx.qry.ignorews);
 }