diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2011-03-07 15:31:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-10 00:50:54 +0300 |
| commit | cb56e3093a1b25e105df44640e2224c8f6e6b893 (patch) | |
| tree | 92709f9d3fa476bc60ad8f5954cf668c5903c846 /t/t6007-rev-list-cherry-pick-file.sh | |
| parent | adbbb31e0d3b4cc7845c6d23d21c00da51025208 (diff) | |
rev-list: documentation and test for --cherry-mark
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6007-rev-list-cherry-pick-file.sh')
| -rwxr-xr-x | t/t6007-rev-list-cherry-pick-file.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh index cd089a913b..37bd25eaaa 100755 --- a/t/t6007-rev-list-cherry-pick-file.sh +++ b/t/t6007-rev-list-cherry-pick-file.sh @@ -100,6 +100,34 @@ test_expect_success '--cherry-pick bar does not come up empty (II)' ' ' cat >expect <<EOF ++tags/F +=tags/D ++tags/E +=tags/C +EOF + +test_expect_success '--cherry-mark' ' + git rev-list --cherry-mark F...E -- bar > actual && + git name-rev --stdin --name-only --refs="*tags/*" \ + < actual > actual.named && + test_cmp actual.named expect +' + +cat >expect <<EOF +<tags/F +=tags/D +>tags/E +=tags/C +EOF + +test_expect_success '--cherry-mark --left-right' ' + git rev-list --cherry-mark --left-right F...E -- bar > actual && + git name-rev --stdin --name-only --refs="*tags/*" \ + < actual > actual.named && + test_cmp actual.named expect +' + +cat >expect <<EOF tags/E EOF |