diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-11 14:57:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-11 14:57:45 -0700 |
| commit | 2d83abd4b2d12584391cda288a17461a9ae4ba5f (patch) | |
| tree | edb820affd45cdff49f452a63dd82b24fcd38a59 /t | |
| parent | 7ed863a85a6ce2c4ac4476848310b8f917ab41f9 (diff) | |
| parent | 4da5af3151301d25a25d60a90b8275eaca13de86 (diff) | |
| download | git-2d83abd4b2d12584391cda288a17461a9ae4ba5f.tar.gz | |
Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
Update the fix for 1.7.4 maintenance track.
* jc/maint-1.6.6-pathspec-stdin-and-cmdline:
setup_revisions(): take pathspec from command line and --stdin correctly
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6017-rev-list-stdin.sh | 17 |
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 |