summaryrefslogtreecommitdiff
path: root/t/t4013-diff-various.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-03 12:31:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-03 12:31:59 -0700
commit1030536153db404daba4a140d1e3fa1a7ba470a5 (patch)
tree7884237494bd5202639c72dc8080f03baab35cb9 /t/t4013-diff-various.sh
parentMerge branch 'jk/format-patch-multiline-header' into maint (diff)
parentlog: fix --max-count when used together with -S or -G (diff)
downloadtgif-1030536153db404daba4a140d1e3fa1a7ba470a5.tar.xz
Merge branch 'mm/maint-log-n-with-diff-filtering' into maint
* mm/maint-log-n-with-diff-filtering: log: fix --max-count when used together with -S or -G
Diffstat (limited to 't/t4013-diff-various.sh')
-rwxr-xr-xt/t4013-diff-various.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index b8f81d07c3..5daa0f2a0c 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -210,6 +210,9 @@ log -m -p master
log -SF master
log -S F master
log -SF -p master
+log -SF master --max-count=0
+log -SF master --max-count=1
+log -SF master --max-count=2
log -GF master
log -GF -p master
log -GF -p --pickaxe-all master