diff options
author | Johan Herland <johan@herland.net> | 2011-04-12 11:24:34 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-12 11:29:34 -0700 |
commit | 2ca86714703f81f9dd5dfb31f8d97a8a0089634d (patch) | |
tree | 03e96bbf2b7fafaa57b6ff9dad2346b518a26fca | |
parent | Teach --dirstat not to completely ignore rearranged lines within a file (diff) | |
download | tgif-2ca86714703f81f9dd5dfb31f8d97a8a0089634d.tar.xz |
--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>
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |