diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2011-04-26 10:24:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-26 13:13:20 -0700 |
| commit | b388e14b89f0a82b8067b3922a93cf2d1b013ff0 (patch) | |
| tree | de39c28c8604f4c03270d50a1c3dcf49ec9cf196 /t/t6007-rev-list-cherry-pick-file.sh | |
| parent | ec014eac0e9e6f30cbbca616090fa2ecf74797e7 (diff) | |
| download | git-b388e14b89f0a82b8067b3922a93cf2d1b013ff0.tar.gz | |
rev-list --count: separate count for --cherry-mark
When --count is used with --cherry-mark, omit the patch equivalent
commits from the count for left and right commits and print the count of
equivalent commits separately.
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 | 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 && |