diff options
| author | Kevin Bracey <kevin@bracey.fi> | 2013-05-13 19:00:47 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-16 22:45:34 +0400 |
| commit | a765499a0884375c47c78d0d1e2926e875074427 (patch) | |
| tree | 2ef7689495516b64b25f213a4150a43afd7a6199 /t/t6019-rev-list-ancestry-path.sh | |
| parent | f659031c1ceb979d423161541a8a3763bfd7c96c (diff) | |
revision.c: treat A...B merge bases as if manually specified
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>
Diffstat (limited to 't/t6019-rev-list-ancestry-path.sh')
| -rwxr-xr-x | t/t6019-rev-list-ancestry-path.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh index 5287f6af32..dd5b0e55d2 100755 --- a/t/t6019-rev-list-ancestry-path.sh +++ b/t/t6019-rev-list-ancestry-path.sh @@ -81,7 +81,7 @@ test_expect_success 'rev-list F...I' ' test_cmp expect actual ' -test_expect_failure 'rev-list --ancestry-path F...I' ' +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" | |