summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--shared.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/shared.c b/shared.c
index 3926b4a..3778a5b 100644
--- a/shared.c
+++ b/shared.c
@@ -302,9 +302,8 @@ void cgit_diff_tree(const unsigned char *old_sha1,
302 const unsigned char *new_sha1, 302 const unsigned char *new_sha1,
303 filepair_fn fn, const char *prefix, int ignorews) 303 filepair_fn fn, const char *prefix, int ignorews)
304{ 304{
305 struct diff_options opt; 305 struct diff_options opt;
306 int ret;
307 int prefixlen; 306 int prefixlen;
308 307
309 diff_setup(&opt); 308 diff_setup(&opt);
310 opt.output_format = DIFF_FORMAT_CALLBACK; 309 opt.output_format = DIFF_FORMAT_CALLBACK;
@@ -323,11 +322,11 @@ void cgit_diff_tree(const unsigned char *old_sha1,
323 } 322 }
324 diff_setup_done(&opt); 323 diff_setup_done(&opt);
325 324
326 if (old_sha1 && !is_null_sha1(old_sha1)) 325 if (old_sha1 && !is_null_sha1(old_sha1))
327 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 326 diff_tree_sha1(old_sha1, new_sha1, "", &opt);
328 else 327 else
329 ret = diff_root_tree_sha1(new_sha1, "", &opt); 328 diff_root_tree_sha1(new_sha1, "", &opt);
330 diffcore_std(&opt); 329 diffcore_std(&opt);
331 diff_flush(&opt); 330 diff_flush(&opt);
332} 331}
333 332