author | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:30 (UTC) |
commit | 6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) (side-by-side diff) | |
tree | e9d2ea0555f801653cc9caa382e33afc7c5d804d /shared.c | |
parent | 5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff) | |
parent | 72ef913514288bd2aae23509581097bfd3edf8c4 (diff) | |
download | cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.bz2 |
Merge branch 'jh/ignorews'
-rw-r--r-- | shared.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -265,5 +265,5 @@ int cgit_diff_files(const unsigned char *old_sha1, const unsigned char *new_sha1, unsigned long *old_size, unsigned long *new_size, int *binary, int context, - linediff_fn fn) + int ignorews, linediff_fn fn) { mmfile_t file1, file2; @@ -292,4 +292,6 @@ int cgit_diff_files(const unsigned char *old_sha1, memset(&emit_cb, 0, sizeof(emit_cb)); diff_params.flags = XDF_NEED_MINIMAL; + if (ignorews) + diff_params.flags |= XDF_IGNORE_WHITESPACE; emit_params.ctxlen = context > 0 ? context : 3; emit_params.flags = XDL_EMIT_FUNCNAMES; @@ -306,5 +308,5 @@ int cgit_diff_files(const unsigned char *old_sha1, 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) { struct diff_options opt; @@ -317,4 +319,6 @@ void cgit_diff_tree(const unsigned char *old_sha1, opt.rename_limit = ctx.cfg.renamelimit; DIFF_OPT_SET(&opt, RECURSIVE); + if (ignorews) + DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); opt.format_callback = cgit_diff_tree_cb; opt.format_callback_data = fn; @@ -341,5 +345,6 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) if (commit->parents) 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); } |