From 2ca86714703f81f9dd5dfb31f8d97a8a0089634d Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Tue, 12 Apr 2011 11:24:34 +0200 Subject: [PATCH] --dirstat: In case of renames, use target filename instead of source filename This changes --dirstat analysis to count "damage" toward the target filename, rather than the source filename. For renames within a directory, this won't matter to the final output, but when moving files between diretories, the output now lists the target directory rather than the source directory. Signed-off-by: Johan Herland Acked-by: Linus Torvalds Signed-off-by: Junio C Hamano --- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff.c b/diff.c index 1f44cb4237..abd9cd5f33 100644 --- a/diff.c +++ b/diff.c @@ -1541,7 +1541,7 @@ static void show_dirstat(struct diff_options *options) unsigned long copied, added, damage; int content_changed; - name = p->one->path ? p->one->path : p->two->path; + name = p->two->path ? p->two->path : p->one->path; if (p->one->sha1_valid && p->two->sha1_valid) content_changed = hashcmp(p->one->sha1, p->two->sha1); -- 2.11.4.GIT