Browse Source

t6007: test rev-list --cherry

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael J Gruber 14 years ago committed by Junio C Hamano
parent
commit
fe3b59e595
  1. 12
      t/t6007-rev-list-cherry-pick-file.sh

12
t/t6007-rev-list-cherry-pick-file.sh

@ -145,6 +145,18 @@ test_expect_success '--cherry-pick --left-only' ' @@ -145,6 +145,18 @@ test_expect_success '--cherry-pick --left-only' '
test_cmp actual.named expect
'

cat >expect <<EOF
+tags/E
=tags/C
EOF

test_expect_success '--cherry' '
git rev-list --cherry F...E -- bar > actual &&
git name-rev --stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
test_cmp actual.named expect
'

test_expect_success '--cherry-pick with independent, but identical branches' '
git symbolic-ref HEAD refs/heads/independent &&
rm .git/index &&

Loading…
Cancel
Save