diff options
author | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 22:03:30 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 22:03:30 (JST) |
commit | 6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) | |
tree | e9d2ea0555f801653cc9caa382e33afc7c5d804d /cgit.h | |
parent | 5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff) | |
parent | 72ef913514288bd2aae23509581097bfd3edf8c4 (diff) | |
download | cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz |
Merge branch 'jh/ignorews'
Diffstat (limited to 'cgit.h')
-rw-r--r-- | cgit.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -148,6 +148,7 @@ struct cgit_query { | |||
148 | int ssdiff; | 148 | int ssdiff; |
149 | int show_all; | 149 | int show_all; |
150 | int context; | 150 | int context; |
151 | int ignorews; | ||
151 | char *vpath; | 152 | char *vpath; |
152 | }; | 153 | }; |
153 | 154 | ||
@@ -279,11 +280,12 @@ extern void *cgit_free_commitinfo(struct commitinfo *info); | |||
279 | extern int cgit_diff_files(const unsigned char *old_sha1, | 280 | extern int cgit_diff_files(const unsigned char *old_sha1, |
280 | const unsigned char *new_sha1, | 281 | const unsigned char *new_sha1, |
281 | unsigned long *old_size, unsigned long *new_size, | 282 | unsigned long *old_size, unsigned long *new_size, |
282 | int *binary, int context, linediff_fn fn); | 283 | int *binary, int context, int ignorews, |
284 | linediff_fn fn); | ||
283 | 285 | ||
284 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 286 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
285 | const unsigned char *new_sha1, | 287 | const unsigned char *new_sha1, |
286 | filepair_fn fn, const char *prefix); | 288 | filepair_fn fn, const char *prefix, int ignorews); |
287 | 289 | ||
288 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 290 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
289 | 291 | ||