summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-30 00:03:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-30 00:03:10 (GMT)
commita852aac48d881d538e24d5493e218a93b12b1709 (patch)
tree9444d09ddf9301428842a6e424832eec458f5c92 /t
parent0faf247485c2dc92fd8b492a5c4b49237e0338ee (diff)
parente5f85df87e8f1adb40288265ef54a16128691688 (diff)
downloadgit-a852aac48d881d538e24d5493e218a93b12b1709.zip
git-a852aac48d881d538e24d5493e218a93b12b1709.tar.gz
git-a852aac48d881d538e24d5493e218a93b12b1709.tar.bz2
Merge branch 'mg/diff-stat-count'
* mg/diff-stat-count: diff --stat-count: finishing touches diff-options.txt: describe --stat-{width,name-width,count} diff: introduce --stat-lines to limit the stat lines diff.c: omit hidden entries from namelen calculation with --stat
Diffstat (limited to 't')
-rwxr-xr-xt/t4049-diff-stat-count.sh25
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
new file mode 100755
index 0000000..641e70d
--- /dev/null
+++ b/t/t4049-diff-stat-count.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Copyright (c) 2011, Google Inc.
+
+test_description='diff --stat-count'
+. ./test-lib.sh
+
+test_expect_success setup '
+ >a &&
+ >b &&
+ >c &&
+ >d &&
+ git add a b c d &&
+ chmod +x c d &&
+ echo a >a &&
+ echo b >b &&
+ cat >expect <<-\EOF
+ a | 1 +
+ b | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+ EOF
+ git diff --stat --stat-count=2 >actual &&
+ test_cmp expect actual
+'
+
+test_done