summaryrefslogtreecommitdiff
path: root/t/t4201-shortlog.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2016-07-11 15:11:37 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-11 12:32:02 -0700
commitbac233f2c28428c3e2c5279910bc4c027cd0b540 (patch)
treebc55fdf4985a0893e495d47cf761be7bcc344b0e /t/t4201-shortlog.sh
parentdiff: do not color output when --color=auto and --output=<file> is given (diff)
downloadtgif-bac233f2c28428c3e2c5279910bc4c027cd0b540.tar.xz
mingw: fix the shortlog --output=<file> test
Adjust t4201 to pass on Windows; a couple of test cases need to be skipped on Windows which leads to a different shortlog than on Linux. Let's just fix that by limiting the shortlog's commit range to traverse only one commit: that guarantees that it does not matter how many test cases were skipped. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4201-shortlog.sh')
-rwxr-xr-xt/t4201-shortlog.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index bd699e11f1..ae08b57712 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -185,9 +185,9 @@ test_expect_success 'shortlog with revision pseudo options' '
'
test_expect_success 'shortlog with --output=<file>' '
- git shortlog --output=shortlog master >output &&
+ git shortlog --output=shortlog -1 master >output &&
test ! -s output &&
- test_line_count = 7 shortlog
+ test_line_count = 3 shortlog
'
test_done