revision: --ancestry-path
"rev-list A..H" computes the set of commits that are ancestors of H, but
excludes the ones that are ancestors of A. This is useful to see what
happened to the history leading to H since A, in the sense that "what does
H have that did not exist in A" (e.g. when you have a choice to update to
H from A).
x---x---A---B---C <-- topic
/ \
x---x---x---o---o---o---o---M---D---E---F---G <-- dev
/ \
x---o---o---o---o---o---o---o---o---o---o---o---N---H <-- master
The result in the above example would be the commits marked with caps
letters (except for A itself, of course), and the ones marked with 'o'.
When you want to find out what commits in H are contaminated with the bug
introduced by A and need fixing, however, you might want to view only the
subset of "A..B" that are actually descendants of A, i.e. excluding the
ones marked with 'o'. Introduce a new option --ancestry-path to compute
this set with "rev-list --ancestry-path A..B".
Note that in practice, you would build a fix immediately on top of A and
"git branch --contains A" will give the names of branches that you would
need to merge the fix into (i.e. topic, dev and master), so this may not
be worth paying the extra cost of postprocessing.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-20 22:48:39 +02:00
|
|
|
#!/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
|
2010-06-04 01:17:37 +02:00
|
|
|
#
|
|
|
|
# D..M -- M.t == M
|
|
|
|
# --ancestry-path D..M -- M.t == M
|
revision: --ancestry-path
"rev-list A..H" computes the set of commits that are ancestors of H, but
excludes the ones that are ancestors of A. This is useful to see what
happened to the history leading to H since A, in the sense that "what does
H have that did not exist in A" (e.g. when you have a choice to update to
H from A).
x---x---A---B---C <-- topic
/ \
x---x---x---o---o---o---o---M---D---E---F---G <-- dev
/ \
x---o---o---o---o---o---o---o---o---o---o---o---N---H <-- master
The result in the above example would be the commits marked with caps
letters (except for A itself, of course), and the ones marked with 'o'.
When you want to find out what commits in H are contaminated with the bug
introduced by A and need fixing, however, you might want to view only the
subset of "A..B" that are actually descendants of A, i.e. excluding the
ones marked with 'o'. Introduce a new option --ancestry-path to compute
this set with "rev-list --ancestry-path A..B".
Note that in practice, you would build a fix immediately on top of A and
"git branch --contains A" will give the names of branches that you would
need to merge the fix into (i.e. topic, dev and master), so this may not
be worth paying the extra cost of postprocessing.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-20 22:48:39 +02:00
|
|
|
|
|
|
|
. ./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
|
|
|
|
'
|
|
|
|
|
2010-06-04 01:17:37 +02:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2011-08-25 18:49:13 +02:00
|
|
|
# b---bc
|
|
|
|
# / \ /
|
|
|
|
# a X
|
|
|
|
# \ / \
|
|
|
|
# c---cb
|
|
|
|
test_expect_success 'setup criss-cross' '
|
|
|
|
mkdir criss-cross &&
|
|
|
|
(cd criss-cross &&
|
|
|
|
git init &&
|
|
|
|
test_commit A &&
|
|
|
|
git checkout -b b master &&
|
|
|
|
test_commit B &&
|
|
|
|
git checkout -b c master &&
|
|
|
|
test_commit C &&
|
|
|
|
git checkout -b bc b -- &&
|
|
|
|
git merge c &&
|
|
|
|
git checkout -b cb c -- &&
|
|
|
|
git merge b &&
|
|
|
|
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 cb..bc > actual &&
|
|
|
|
test -z "$(cat actual)")
|
|
|
|
'
|
|
|
|
|
|
|
|
# no commits in repository descend from cb
|
|
|
|
test_expect_failure 'criss-cross: rev-list --ancestry-path --all ^cb' '
|
|
|
|
(cd criss-cross &&
|
|
|
|
git rev-list --ancestry-path --all ^cb > actual &&
|
|
|
|
test -z "$(cat actual)")
|
|
|
|
'
|
|
|
|
|
revision: --ancestry-path
"rev-list A..H" computes the set of commits that are ancestors of H, but
excludes the ones that are ancestors of A. This is useful to see what
happened to the history leading to H since A, in the sense that "what does
H have that did not exist in A" (e.g. when you have a choice to update to
H from A).
x---x---A---B---C <-- topic
/ \
x---x---x---o---o---o---o---M---D---E---F---G <-- dev
/ \
x---o---o---o---o---o---o---o---o---o---o---o---N---H <-- master
The result in the above example would be the commits marked with caps
letters (except for A itself, of course), and the ones marked with 'o'.
When you want to find out what commits in H are contaminated with the bug
introduced by A and need fixing, however, you might want to view only the
subset of "A..B" that are actually descendants of A, i.e. excluding the
ones marked with 'o'. Introduce a new option --ancestry-path to compute
this set with "rev-list --ancestry-path A..B".
Note that in practice, you would build a fix immediately on top of A and
"git branch --contains A" will give the names of branches that you would
need to merge the fix into (i.e. topic, dev and master), so this may not
be worth paying the extra cost of postprocessing.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-20 22:48:39 +02:00
|
|
|
test_done
|