diff options
| author | Johan Herland <johan@herland.net> | 2011-04-11 00:48:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-11 11:16:15 -0700 |
| commit | 2ff3a80334115797b8446909655e536f43900bc5 (patch) | |
| tree | c3c56eea112b1634548a490d4610d23d62c4fc1d /t/t4013-diff-various.sh | |
| parent | 0133dab75d8b15c559aa9df66134d72dce0e0476 (diff) | |
| download | git-2ff3a80334115797b8446909655e536f43900bc5.tar.gz | |
Teach --dirstat not to completely ignore rearranged lines within a file
Currently, the --dirstat analysis ignores when lines within a file are
rearranged, because the "damage" calculated by show_dirstat() is 0.
However, if the object name has changed, we already know that there is
some damage, and it is unintuitive to claim there is _no_ damage.
Teach show_dirstat() to assign a minimum amount of damage (== 1) to
entries for which the analysis otherwise yields zero damage, to still
represent that these files are changed, instead of saying that there
is no change.
Also, skip --dirstat analysis when the object names are the same (e.g. for
a pure file rename).
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/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 6428a905ab..93a6f20871 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -300,9 +300,7 @@ diff --no-index --name-status -- dir2 dir diff --no-index dir dir3 diff master master^ side diff --dirstat master~1 master~2 -# --dirstat doesn't notice changes that simply rearrange existing lines diff --dirstat initial rearrange -# ...but --dirstat-by-file does notice changes that only rearrange lines diff --dirstat-by-file initial rearrange EOF |