summaryrefslogtreecommitdiff
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)
downloadcgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.gz
cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.bz2
cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.zip
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 '')
-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);
an>Allow relative paths for cgit_cache_rootLars Hjemli2-0/+8 2006-12-16Add cache-root option to /cgit/rcLars Hjemli1-0/+2 2006-12-16Add argument parsing + switch for uncached operationLars Hjemli3-3/+51 2006-12-16Add head comment to shared.cLars Hjemli1-0/+8 2006-12-16Add head comment to ui-commit.cLars Hjemli1-0/+8 2006-12-16gitweb ripoff: set tr:hover to highligt current rowLars Hjemli1-3/+7 2006-12-16Make repo header a link to summary pageLars Hjemli2-1/+12 2006-12-16Move cgit_print_date into ui-shared, reuse in ui-summaryLars Hjemli4-20/+24 2006-12-16Add ui-commit.c + misc ui cleanupsLars Hjemli9-19/+140 2006-12-15Add a common commit parserLars Hjemli3-63/+75 2006-12-14Add simple pager to log pageLars Hjemli4-6/+37 2006-12-13Add separate makefile-rule to clear current cacheLars Hjemli1-2/+4 2006-12-13Remove implementation details from READMELars Hjemli1-53/+34 2006-12-13Small layout adjustments to summary and blob viewLars Hjemli3-5/+13 2006-12-13Add display of tree content w/ui-tree.cLars Hjemli9-8/+113 2006-12-12cache_lock: do xstrdup/free on lockfileLars Hjemli1-1/+2 2006-12-11Don't truncate valid cachefilesLars Hjemli3-4/+16 2006-12-11Move global variables + callback functions into shared.cLars Hjemli4-82/+86 2006-12-11Move functions for generic object output into ui-view.cLars Hjemli4-34/+43 2006-12-11Move log-functions into ui-log.cLars Hjemli5-111/+121 2006-12-11Move repo summary functions into ui-summary.cLars Hjemli4-47/+59 2006-12-11Move functions for repolist output into ui-repolist.cLars Hjemli5-70/+90 2006-12-11Move common output-functions into ui-shared.cLars Hjemli4-82/+99 2006-12-11Rename config.c to parsing.c + move cgit_parse_query from cgit.c to parsing.cLars Hjemli4-28/+29 2006-12-11Avoid infinite loops in caching layerLars Hjemli3-14/+31 2006-12-11Let 'make install' clear all cachefilesLars Hjemli1-0/+2 2006-12-11Fix cache algorithm loopholeLars Hjemli3-11/+16 2006-12-10Add version identifier in generated filesLars Hjemli2-9/+14 2006-12-10Add license file and copyright noticesLars Hjemli5-0/+372 2006-12-10Add caching infrastructureLars Hjemli9-28/+353