diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:18 -0700 |
| commit | e2e4aed5defb2df8dbd523613ff4ef46050abb07 (patch) | |
| tree | 8244d31b8cfbf8258e728677f5082273e9676afd /t | |
| parent | 7b11753402e17be4a3fae47a0aaf616b93cd5028 (diff) | |
| parent | 8f2d4b1934f398c625019e5e696efcc3d6a875ce (diff) | |
Merge branch 'jc/maint-pathspec-stdin-and-cmdline'
* jc/maint-pathspec-stdin-and-cmdline:
setup_revisions(): take pathspec from command line and --stdin correctly
Conflicts:
revision.c
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 |