summaryrefslogtreecommitdiffabout
path: root/ui-patch.c
authorLars Hjemli <hjemli@gmail.com>2010-07-18 13:03:30 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-07-18 13:03:30 (UTC)
commit6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) (side-by-side diff)
treee9d2ea0555f801653cc9caa382e33afc7c5d804d /ui-patch.c
parent5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff)
parent72ef913514288bd2aae23509581097bfd3edf8c4 (diff)
downloadcgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip
cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz
cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.bz2
Merge branch 'jh/ignorews'
Diffstat (limited to 'ui-patch.c') (more/less context) (show whitespace changes)
-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
@@ -68,13 +68,13 @@ static void filepair_cb(struct diff_filepair *pair)
print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
if (S_ISGITLINK(pair->two->mode))
print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
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");
}
void cgit_print_patch(char *hex, const char *prefix)
@@ -121,11 +121,11 @@ void cgit_print_patch(char *hex, const char *prefix)
if (info->msg[strlen(info->msg) - 1] != '\n')
html("\n");
}
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);
}