diff options
| author | Johan Herland <johan@herland.net> | 2011-04-11 00:48:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-11 10:11:17 -0700 |
| commit | 204f01a2f734fddab95b09123b04b1305620e7b6 (patch) | |
| tree | 2f2f3a4676b2ae2ed270f8d23f153cafb049e789 /t/t4013-diff-various.sh | |
| parent | 5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e (diff) | |
| download | git-204f01a2f734fddab95b09123b04b1305620e7b6.tar.gz | |
--dirstat: Describe non-obvious differences relative to --stat or regular diff
Also add a testcase documenting the current behavior.
Improved-by: Junio C Hamano <gitster@pobox.com>
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 | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 5daa0f2a0c..3b1b392a56 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -80,18 +80,31 @@ test_expect_success setup ' git config log.showroot false && git commit --amend && + + GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" && + GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" && + export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && + git checkout -b rearrange initial && + for i in B A; do echo $i; done >dir/sub && + git add dir/sub && + git commit -m "Rearranged lines in dir/sub" && + git checkout master && + git show-branch ' : <<\EOF ! [initial] Initial * [master] Merge branch 'side' - ! [side] Side ---- - - [master] Merge branch 'side' - *+ [side] Side - * [master^] Second -+*+ [initial] Initial + ! [rearrange] Rearranged lines in dir/sub + ! [side] Side +---- + + [rearrange] Rearranged lines in dir/sub + - [master] Merge branch 'side' + * + [side] Side + * [master^] Third + * [master~2] Second ++*++ [initial] Initial EOF V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'` @@ -287,6 +300,8 @@ 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 EOF test_expect_success 'log -S requires an argument' ' |