Staging
v0.8.1
v0.8.1
Revision 3983caa531d31b2b95647ae60ac23a0e12385718 authored by Junio C Hamano on 16 February 2008, 18:38:12 UTC, committed by Junio C Hamano on 16 February 2008, 18:51:46 UTC
Since 3368d11 (Remove unnecessary git-rm --cached reference from status output), the status output marks the "Added but not yet committed" section as "Changes to be committed". Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 959ba67
t6007-rev-list-cherry-pick-file.sh
#!/bin/sh
test_description='test git rev-list --cherry-pick -- file'
. ./test-lib.sh
# A---B
# \
# \
# C
#
# B changes a file foo.c, adding a line of text. C changes foo.c as
# well as bar.c, but the change in foo.c was identical to change B.
test_expect_success setup '
echo Hallo > foo &&
git add foo &&
test_tick &&
git commit -m "A" &&
git tag A &&
git checkout -b branch &&
echo Bello > foo &&
echo Cello > bar &&
git add foo bar &&
test_tick &&
git commit -m "C" &&
git tag C &&
git checkout master &&
git checkout branch foo &&
test_tick &&
git commit -m "B" &&
git tag B
'
test_expect_success '--cherry-pick foo comes up empty' '
test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
'
test_expect_success '--cherry-pick bar does not come up empty' '
! test -z "$(git rev-list --left-right --cherry-pick B...C -- bar)"
'
test_expect_success '--cherry-pick with independent, but identical branches' '
git symbolic-ref HEAD refs/heads/independent &&
rm .git/index &&
echo Hallo > foo &&
git add foo &&
test_tick &&
git commit -m "independent" &&
echo Bello > foo &&
test_tick &&
git commit -m "independent, too" foo &&
test -z "$(git rev-list --left-right --cherry-pick \
HEAD...master -- foo)"
'
test_done
Computing file changes ...