summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -300,13 +300,12 @@ 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, int ignorews)
{
struct diff_options opt;
- int ret;
int prefixlen;
diff_setup(&opt);
opt.output_format = DIFF_FORMAT_CALLBACK;
opt.detect_rename = 1;
opt.rename_limit = ctx.cfg.renamelimit;
@@ -321,15 +320,15 @@ void cgit_diff_tree(const unsigned char *old_sha1,
prefixlen = strlen(prefix);
opt.pathlens = &prefixlen;
}
diff_setup_done(&opt);
if (old_sha1 && !is_null_sha1(old_sha1))
- ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
+ diff_tree_sha1(old_sha1, new_sha1, "", &opt);
else
- ret = diff_root_tree_sha1(new_sha1, "", &opt);
+ diff_root_tree_sha1(new_sha1, "", &opt);
diffcore_std(&opt);
diff_flush(&opt);
}
void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
{