summary refs log tree commit diff
path: root/ui-patch.c
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-06-24 17:52:57 +0200
committerLars Hjemli <hjemli@gmail.com>2010-07-18 10:53:48 +0200
commit2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (patch)
tree48d555b15c0432bb98712d746100bf6c0fe2be4a /ui-patch.c
parentd20313e3daf855ee5d4808e050f54614c200d7b1 (diff)
Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs
The new ctx.qry.ignorews variable is passed via cgit_diff_files() and
cgit_diff_tree() to Git's diff machinery. This is equivalent to passing
--ignore-all-space to 'git diff'.

Signed-off-by: Johan Herland <johan@herland.net>
Diffstat (limited to 'ui-patch.c')
-rw-r--r--ui-patch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-patch.c b/ui-patch.c
index d13104c..ca008f3 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair)
 		return;
 	}
 	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-			    &new_size, &binary, 0, print_line))
+			    &new_size, &binary, 0, 0, print_line))
 		html("Error running diff");
 	if (binary)
 		html("Binary files differ\n");
@@ -124,7 +124,7 @@ void cgit_print_patch(char *hex, const char *prefix)
 	html("---\n");
 	if (prefix)
 		htmlf("(limited to '%s')\n\n", prefix);
-	cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix);
+	cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0);
 	html("--\n");
 	htmlf("cgit %s\n", CGIT_VERSION);
 	cgit_free_commitinfo(info);