mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![Thomas Rast](/assets/img/avatar_default.png)
Add a --count option that, instead of actually listing the commits, merely counts them. This is mostly geared towards script use, and to this end it acts specially when used with --left-right: it outputs the left and right counts separately. Previously, scripts would have to run a shell loop or small inline script over to achieve the same. (Without --left-right, a simple |wc -l does the job.) Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
87 lines
1.8 KiB
Bash
Executable file
87 lines
1.8 KiB
Bash
Executable file
#!/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
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
<tags/B
|
|
>tags/C
|
|
EOF
|
|
|
|
test_expect_success '--left-right' '
|
|
git rev-list --left-right B...C > actual &&
|
|
git name-rev --stdin --name-only --refs="*tags/*" \
|
|
< actual > actual.named &&
|
|
test_cmp actual.named expect
|
|
'
|
|
|
|
test_expect_success '--count' '
|
|
git rev-list --count B...C > actual &&
|
|
test "$(cat actual)" = 2
|
|
'
|
|
|
|
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)"
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
1 2
|
|
EOF
|
|
|
|
# Insert an extra commit to break the symmetry
|
|
test_expect_success '--count --left-right' '
|
|
git checkout branch &&
|
|
test_commit D &&
|
|
git rev-list --count --left-right B...D > actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|