aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-26 09:38:44 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-26 09:38:44 -0700
commitea8ec091fad354628bb9e43ce67dc47559b9a611 (patch)
tree64bf1d3feb583cdf13f4d190453d7021fef9c77b /t
parent0e66f8722c18194665084e85180bd9f3276f3960 (diff)
parent8f2d4b1934f398c625019e5e696efcc3d6a875ce (diff)
downloadgit-ea8ec091fad354628bb9e43ce67dc47559b9a611.tar.gz
git-ea8ec091fad354628bb9e43ce67dc47559b9a611.tar.xz
Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maint
* jc/maint-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 f1c32dba4..667b37564 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