X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tree-diff.c;h=76f83fcc27e50b12ddbc8f72badd8d29f5b4230d;hb=20fc73e3b0bb2b115d88e54514db13ffaf11b025;hp=3954281f509bbed9a9b095ed92d24b67275fed82;hpb=75618f1106b95defafca698d5cfdfd3dfb3a7e3c;p=git.git diff --git a/tree-diff.c b/tree-diff.c index 3954281f5..76f83fcc2 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -17,7 +17,6 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const unsigned char *sha1, *sha2; int cmp, pathlen1, pathlen2; int old_baselen = base->len; - int retval = 0; sha1 = tree_entry_extract(t1, &path1, &mode1); sha2 = tree_entry_extract(t2, &path2, &mode2); @@ -53,7 +52,7 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, sha1, sha2, base->buf, 0, 0); } strbuf_addch(base, '/'); - retval = diff_tree_sha1(sha1, sha2, base->buf, opt); + diff_tree_sha1(sha1, sha2, base->buf, opt); } else { opt->change(opt, mode1, mode2, sha1, sha2, base->buf, 0, 0); }