author | Brad King <brad.king@kitware.com> | |
Thu, 25 Aug 2011 16:49:13 +0000 (12:49 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 25 Aug 2011 23:40:48 +0000 (16:40 -0700) | ||
commit | 81f4953120f021832a0023dc704a0d7eb0ddf475 | |
tree | e3b85a63293e17392b38987f4bde290f51bd128e | tree | snapshot |
parent | cb7529e13bce186f8b883c9fbb08602cd3a0795f | commit | diff |
rev-list: Demonstrate breakage with --ancestry-path --all
The option added by commit ebdc94f3 (revision: --ancestry-path,
2010-04-20) does not work properly in combination with --all, at least
in the case of a criss-cross merge:
b---bc
/ \ /
a X
\ / \
c---cb
There are no descendants of 'cb' in the history. The command
git rev-list --ancestry-path cb..bc
correctly reports no commits. However, the command
git rev-list --ancestry-path --all ^cb
reports 'bc'. Add a test case to t6019-rev-list-ancestry-path
demonstrating this breakage.
Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The option added by commit ebdc94f3 (revision: --ancestry-path,
2010-04-20) does not work properly in combination with --all, at least
in the case of a criss-cross merge:
b---bc
/ \ /
a X
\ / \
c---cb
There are no descendants of 'cb' in the history. The command
git rev-list --ancestry-path cb..bc
correctly reports no commits. However, the command
git rev-list --ancestry-path --all ^cb
reports 'bc'. Add a test case to t6019-rev-list-ancestry-path
demonstrating this breakage.
Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6019-rev-list-ancestry-path.sh | diff | blob | history |