summaryrefslogtreecommitdiff
path: root/t/t6007-rev-list-cherry-pick-file.sh
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2011-03-07 13:31:43 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-09 13:50:55 -0800
commitfe3b59e595b02ee57314b74a74df915bdd845011 (patch)
tree00edd8e3048c9739820c6aaf29ccc33e45bdd243 /t/t6007-rev-list-cherry-pick-file.sh
parentlog --cherry: a synonym (diff)
downloadtgif-fe3b59e595b02ee57314b74a74df915bdd845011.tar.xz
t6007: test rev-list --cherry
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-xt/t6007-rev-list-cherry-pick-file.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index 37bd25eaaa..cacf3de6c9 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -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 &&