diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:53 -0700 |
| commit | 117374fe3c58cd98ffb56997e70d2de4ce7acdac (patch) | |
| tree | 4eab50f914ddd6200a66cd95f382c931a1ec60e8 /t | |
| parent | Merge branch 'ss/doc-svn' (diff) | |
| parent | rev-list --count: separate count for --cherry-mark (diff) | |
| download | tgif-117374fe3c58cd98ffb56997e70d2de4ce7acdac.tar.xz | |
Merge branch 'mg/rev-list-count-cherry'
* mg/rev-list-count-cherry:
rev-list --count: separate count for --cherry-mark
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6007-rev-list-cherry-pick-file.sh | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh index cacf3de6c9..28d4f6b259 100755 --- a/t/t6007-rev-list-cherry-pick-file.sh +++ b/t/t6007-rev-list-cherry-pick-file.sh @@ -157,6 +157,33 @@ test_expect_success '--cherry' ' test_cmp actual.named expect ' +cat >expect <<EOF +1 1 +EOF + +test_expect_success '--cherry --count' ' + git rev-list --cherry --count F...E -- bar > actual && + test_cmp actual expect +' + +cat >expect <<EOF +2 2 +EOF + +test_expect_success '--cherry-mark --count' ' + git rev-list --cherry-mark --count F...E -- bar > actual && + test_cmp actual expect +' + +cat >expect <<EOF +1 1 2 +EOF + +test_expect_success '--cherry-mark --left-right --count' ' + git rev-list --cherry-mark --left-right --count F...E -- bar > actual && + test_cmp actual expect +' + test_expect_success '--cherry-pick with independent, but identical branches' ' git symbolic-ref HEAD refs/heads/independent && rm .git/index && |