summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-11 15:05:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-11 16:09:25 -0700
commit8f2d4b1934f398c625019e5e696efcc3d6a875ce (patch)
treeafc1d4cd2ccb08fec11446d55a667583c538ae37 /t
parentRemove duplicated "is a" (diff)
parentMerge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' (diff)
downloadtgif-8f2d4b1934f398c625019e5e696efcc3d6a875ce.tar.xz
Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
Update the fix for 1.7.5 maintenance track. * jc/maint-1.7.4-pathspec-stdin-and-cmdline: setup_revisions(): take pathspec from command line and --stdin correctly
Diffstat (limited to 't')
-rwxr-xr-xt/t6017-rev-list-stdin.sh17
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t6017-rev-list-stdin.sh b/t/t6017-rev-list-stdin.sh
index f1c32dba42..667b37564e 100755
--- a/t/t6017-rev-list-stdin.sh
+++ b/t/t6017-rev-list-stdin.sh
@@ -58,4 +58,21 @@ check side-3 ^side-4 -- file-3
check side-3 ^side-2
check side-3 ^side-2 -- file-1
+test_expect_success 'not only --stdin' '
+ cat >expect <<-EOF &&
+ 7
+
+ file-1
+ file-2
+ EOF
+ cat >input <<-EOF &&
+ ^master^
+ --
+ file-2
+ EOF
+ git log --pretty=tformat:%s --name-only --stdin master -- file-1 \
+ <input >actual &&
+ test_cmp expect actual
+'
+
test_done