[PATCH 15/19] tree-diff: no need to call "full" diff_tree_sha1 from show_path()
- From
Kirill Smelkov <kirr@mns.spb.ru>
- Date
- Feb 24, 2014, 16:21 UTC
- Message-ID
- <7e5e5a381ba4204eac14c5be9e270ffdc0e2be7a.1393257006.git.kirr@mns.spb.ru>
- In-Reply-To
- <cover.1393257006.git.kirr@mns.spb.ru>
As described in previous commit, when recursing into sub-trees, we can use lower-level tree walker, since its interface is now sha1 based.
The change is ok, because diff_tree_sha1() only invokes __diff_tree_sha1(), and also, if base is empty, try_to_follow_renames(). But base is not empty here, as we have added a path and '/' before recursing.
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
( re-posting without change )
tree-diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tree-diff.c b/tree-diff.c index f90acf5..aea0297 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -114,8 +114,8 @@ static void show_path(struct strbuf *base, struct diff_options *opt, if (recurse) { strbuf_addch(base, '/'); - diff_tree_sha1(t1 ? t1->entry.sha1 : NULL, - t2 ? t2->entry.sha1 : NULL, base->buf, opt); + __diff_tree_sha1(t1 ? t1->entry.sha1 : NULL, + t2 ? t2->entry.sha1 : NULL, base->buf, opt); } strbuf_setlen(base, old_baselen);
-- 1.9.rc1.181.g641f458