From: Johan Herland <johan@herland.net>
Date: Tue, 12 Apr 2011 09:24:34 +0000 (+0200)
Subject: --dirstat: In case of renames, use target filename instead of source filename
X-Git-Tag: v1.7.5.1~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2ca86714703f81f9dd5dfb31f8d97a8a0089634d;p=git.git

--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 <johan@herland.net>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff.c b/diff.c
index 1f44cb423..abd9cd5f3 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);