diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-26 20:13:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-26 20:13:17 -0700 |
| commit | 8194fcaa1f0999064a170ed24d36be5432815dce (patch) | |
| tree | 99c52b1bbaa3eee26bb8e21b77cb0ea477cd4dec /tree-diff.c | |
| parent | 908535c1fa1c5cddddfa74732c66d625e99bd6b0 (diff) | |
| parent | c0aa335c95974caebcc972cd63a11e6ff73b1612 (diff) | |
| download | git-8194fcaa1f0999064a170ed24d36be5432815dce.tar.gz | |
Merge branch 'js/remove-unused-variables'
* js/remove-unused-variables:
Remove unused variables
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tree-diff.c b/tree-diff.c index 3954281f50..76f83fcc27 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); } |