about summary refs log tree commit diff stats
path: root/cgit.h
diff options
context:
space:
mode:
authorJohan Herland2010-06-24 17:52:57 +0200
committerLars Hjemli2010-07-18 10:53:48 +0200
commit2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (patch)
tree48d555b15c0432bb98712d746100bf6c0fe2be4a /cgit.h
parentui-diff: Add links to increase/decrease number of context lines in diffs (diff)
downloadcgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.gz
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 'cgit.h')
-rw-r--r--cgit.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/cgit.h b/cgit.h index bb8f598..1bdfbc6 100644 --- a/cgit.h +++ b/cgit.h
@@ -146,6 +146,7 @@ struct cgit_query {
146 int showmsg; 146 int showmsg;
147 int ssdiff; 147 int ssdiff;
148 int context; 148 int context;
149 int ignorews;
149 char *vpath; 150 char *vpath;
150}; 151};
151 152
@@ -275,11 +276,12 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
275extern int cgit_diff_files(const unsigned char *old_sha1, 276extern int cgit_diff_files(const unsigned char *old_sha1,
276 const unsigned char *new_sha1, 277 const unsigned char *new_sha1,
277 unsigned long *old_size, unsigned long *new_size, 278 unsigned long *old_size, unsigned long *new_size,
278 int *binary, int context, linediff_fn fn); 279 int *binary, int context, int ignorews,
280 linediff_fn fn);
279 281
280extern void cgit_diff_tree(const unsigned char *old_sha1, 282extern void cgit_diff_tree(const unsigned char *old_sha1,
281 const unsigned char *new_sha1, 283 const unsigned char *new_sha1,
282 filepair_fn fn, const char *prefix); 284 filepair_fn fn, const char *prefix, int ignorews);
283 285
284extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 286extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
285 287