mirror of
https://github.com/git/git.git
synced 2024-11-06 01:03:02 +01:00
a765499a08
The documentation assures users that "A...B" is defined as "A B --not $(git merge-base --all A B)". This wasn't in fact quite true, because the calculated merge bases were not sent to add_rev_cmdline(). The main effect of this was that although git rev-list --ancestry-path A B --not $(git merge-base --all A B) worked, the simpler form git rev-list --ancestry-path A...B failed with a "no bottom commits" error. Other potential users of bottom commits could also be affected by this problem, if they examine revs->cmdline_info; I came across the issue in my proposed history traversal refinements series. So ensure that the calculated merge bases are sent to add_rev_cmdline(), flagged with new 'whence' enum value REV_CMD_MERGE_BASE. Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
130 lines
2.9 KiB
Bash
Executable file
130 lines
2.9 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='--ancestry-path'
|
|
|
|
# D---E-------F
|
|
# / \ \
|
|
# B---C---G---H---I---J
|
|
# / \
|
|
# A-------K---------------L--M
|
|
#
|
|
# D..M == E F G H I J K L M
|
|
# --ancestry-path D..M == E F H I J L M
|
|
#
|
|
# D..M -- M.t == M
|
|
# --ancestry-path D..M -- M.t == M
|
|
#
|
|
# F...I == F G H I
|
|
# --ancestry-path F...I == F H I
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_merge () {
|
|
test_tick &&
|
|
git merge -s ours -m "$2" "$1" &&
|
|
git tag "$2"
|
|
}
|
|
|
|
test_expect_success setup '
|
|
test_commit A &&
|
|
test_commit B &&
|
|
test_commit C &&
|
|
test_commit D &&
|
|
test_commit E &&
|
|
test_commit F &&
|
|
git reset --hard C &&
|
|
test_commit G &&
|
|
test_merge E H &&
|
|
test_commit I &&
|
|
test_merge F J &&
|
|
git reset --hard A &&
|
|
test_commit K &&
|
|
test_merge J L &&
|
|
test_commit M
|
|
'
|
|
|
|
test_expect_success 'rev-list D..M' '
|
|
for c in E F G H I J K L M; do echo $c; done >expect &&
|
|
git rev-list --format=%s D..M |
|
|
sed -e "/^commit /d" |
|
|
sort >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list --ancestry-path D..M' '
|
|
for c in E F H I J L M; do echo $c; done >expect &&
|
|
git rev-list --ancestry-path --format=%s D..M |
|
|
sed -e "/^commit /d" |
|
|
sort >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list D..M -- M.t' '
|
|
echo M >expect &&
|
|
git rev-list --format=%s D..M -- M.t |
|
|
sed -e "/^commit /d" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list --ancestry-path D..M -- M.t' '
|
|
echo M >expect &&
|
|
git rev-list --ancestry-path --format=%s D..M -- M.t |
|
|
sed -e "/^commit /d" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list F...I' '
|
|
for c in F G H I; do echo $c; done >expect &&
|
|
git rev-list --format=%s F...I |
|
|
sed -e "/^commit /d" |
|
|
sort >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list --ancestry-path F...I' '
|
|
for c in F H I; do echo $c; done >expect &&
|
|
git rev-list --ancestry-path --format=%s F...I |
|
|
sed -e "/^commit /d" |
|
|
sort >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# b---bc
|
|
# / \ /
|
|
# a X
|
|
# \ / \
|
|
# c---cb
|
|
#
|
|
# All refnames prefixed with 'x' to avoid confusion with the tags
|
|
# generated by test_commit on case-insensitive systems.
|
|
test_expect_success 'setup criss-cross' '
|
|
mkdir criss-cross &&
|
|
(cd criss-cross &&
|
|
git init &&
|
|
test_commit A &&
|
|
git checkout -b xb master &&
|
|
test_commit B &&
|
|
git checkout -b xc master &&
|
|
test_commit C &&
|
|
git checkout -b xbc xb -- &&
|
|
git merge xc &&
|
|
git checkout -b xcb xc -- &&
|
|
git merge xb &&
|
|
git checkout master)
|
|
'
|
|
|
|
# no commits in bc descend from cb
|
|
test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' '
|
|
(cd criss-cross &&
|
|
git rev-list --ancestry-path xcb..xbc > actual &&
|
|
test -z "$(cat actual)")
|
|
'
|
|
|
|
# no commits in repository descend from cb
|
|
test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' '
|
|
(cd criss-cross &&
|
|
git rev-list --ancestry-path --all ^xcb > actual &&
|
|
test -z "$(cat actual)")
|
|
'
|
|
|
|
test_done
|