diff options
author | Lars Hjemli | 2010-07-18 15:03:30 +0200 |
---|---|---|
committer | Lars Hjemli | 2010-07-18 15:03:30 +0200 |
commit | 6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) | |
tree | e9d2ea0555f801653cc9caa382e33afc7c5d804d /ui-patch.c | |
parent | 5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff) | |
parent | 72ef913514288bd2aae23509581097bfd3edf8c4 (diff) | |
download | cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.bz2 cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip |
Merge branch 'jh/ignorews'
Diffstat (limited to 'ui-patch.c')
-rw-r--r-- | ui-patch.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair) | |||
71 | return; | 71 | return; |
72 | } | 72 | } |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
74 | &new_size, &binary, 0, print_line)) | 74 | &new_size, &binary, 0, 0, print_line)) |
75 | html("Error running diff"); | 75 | html("Error running diff"); |
76 | if (binary) | 76 | if (binary) |
77 | html("Binary files differ\n"); | 77 | html("Binary files differ\n"); |
@@ -124,7 +124,7 @@ void cgit_print_patch(char *hex, const char *prefix) | |||
124 | html("---\n"); | 124 | html("---\n"); |
125 | if (prefix) | 125 | if (prefix) |
126 | htmlf("(limited to '%s')\n\n", prefix); | 126 | htmlf("(limited to '%s')\n\n", prefix); |
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); | 127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0); |
128 | html("--\n"); | 128 | html("--\n"); |
129 | htmlf("cgit %s\n", CGIT_VERSION); | 129 | htmlf("cgit %s\n", CGIT_VERSION); |
130 | cgit_free_commitinfo(info); | 130 | cgit_free_commitinfo(info); |