diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 15:03:30 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 15:03:30 +0200 |
| commit | 6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) | |
| tree | e9d2ea0555f801653cc9caa382e33afc7c5d804d /ui-patch.c | |
| parent | Merge branch 'lh/macros' (diff) | |
| parent | ui-diff: Add link to ignore/show whitespace changes in diffs (diff) | |
| download | cgit-pink-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz cgit-pink-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip | |
Merge branch 'jh/ignorews'
Diffstat (limited to '')
| -rw-r--r-- | ui-patch.c | 4 |
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); |