diff options
author | Johan Herland <johan@herland.net> | 2011-04-11 00:48:51 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-11 10:12:24 -0700 |
commit | 0133dab75d8b15c559aa9df66134d72dce0e0476 (patch) | |
tree | e49bd774366c6423641afb8aa38bb7f1bd6cd5f9 /t/t4100/t-apply-9.patch | |
parent | --dirstat: Describe non-obvious differences relative to --stat or regular diff (diff) | |
download | tgif-0133dab75d8b15c559aa9df66134d72dce0e0476.tar.xz |
--dirstat-by-file: Make it faster and more correct
Currently, when using --dirstat-by-file, it first does the full --dirstat
analysis (using diffcore_count_changes()), and then resets 'damage' to 1,
if any damage was found by diffcore_count_changes().
But --dirstat-by-file is not interested in the file damage per se. It only
cares if the file changed at all. In that sense it only cares if the blob
object for a file has changed. We therefore only need to compare the
object names of each file pair in the diff queue and we can skip the
entire --dirstat analysis and simply set 'damage' to 1 for each entry
where the object name has changed.
This makes --dirstat-by-file faster, and also bypasses --dirstat's practice
of ignoring rearranged lines within a file.
The patch also contains an added testcase verifying that --dirstat-by-file
now detects changes that only rearrange lines within a file.
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>
Diffstat (limited to 't/t4100/t-apply-9.patch')
0 files changed, 0 insertions, 0 deletions