path: root/t/t4013
diff options
authorJohan Herland <>2011-04-10 22:48:51 (GMT)
committerJunio C Hamano <>2011-04-11 17:12:24 (GMT)
commit0133dab75d8b15c559aa9df66134d72dce0e0476 (patch)
treee49bd774366c6423641afb8aa38bb7f1bd6cd5f9 /t/t4013
parent204f01a2f734fddab95b09123b04b1305620e7b6 (diff)
--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 <> Acked-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/t4013')
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--dirstat-by-file_initial_rearrange b/t/t4013/diff.diff_--dirstat-by-file_initial_rearrange
new file mode 100644
index 0000000..e48e33f
--- /dev/null
+++ b/t/t4013/diff.diff_--dirstat-by-file_initial_rearrange
@@ -0,0 +1,3 @@
+$ git diff --dirstat-by-file initial rearrange
+ 100.0% dir/