summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2009-02-19 12:13:37 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-20 00:02:48 -0800
commitf37bfb7a4d965e821591c98e66fe7a4e396377b5 (patch)
treeeb61c371e654d8fbc2253923f6bfbeb1fb620a2e /t
parentTest that diff can read from stdin (diff)
downloadtgif-f37bfb7a4d965e821591c98e66fe7a4e396377b5.tar.xz
Test diff --dirstat functionality
This is only a very rudimentary test, but it was untested before. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4013-diff-various.sh1
-rw-r--r--t/t4013/diff.diff_--dirstat_master~1_master~23
2 files changed, 4 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index aba53202f8..f140b9cd49 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -263,6 +263,7 @@ diff --name-status dir2 dir
diff --no-index --name-status dir2 dir
diff --no-index --name-status -- dir2 dir
diff master master^ side
+diff --dirstat master~1 master~2
EOF
test_done
diff --git a/t/t4013/diff.diff_--dirstat_master~1_master~2 b/t/t4013/diff.diff_--dirstat_master~1_master~2
new file mode 100644
index 0000000000..b672e1ca63
--- /dev/null
+++ b/t/t4013/diff.diff_--dirstat_master~1_master~2
@@ -0,0 +1,3 @@
+$ git diff --dirstat master~1 master~2
+ 40.0% dir/
+$