mirror of
https://github.com/git/git.git
synced 2024-11-25 02:44:48 +08:00
cb7529e13b
When using --ancestry-path together with history simplification (typically triggered by path limiting), history simplification would get in the way of --ancestry-path by prematurely removing the parent links between commits on which the ancestry path calculations are made. This patch disables this history simplification when --ancestry-path is enabled. This is similar to what e.g. --full-history already does. The patch also includes a simple testcase verifying that --ancestry-path works together with path limiting. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
1.5 KiB
Bash
Executable File
74 lines
1.5 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
|
|
|
|
. ./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-patch 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_done
|