diff options
author | Kevin Bracey <kevin@bracey.fi> | 2013-05-13 18:00:47 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-16 11:45:34 -0700 |
commit | a765499a0884375c47c78d0d1e2926e875074427 (patch) | |
tree | 2ef7689495516b64b25f213a4150a43afd7a6199 /builtin/remote-ext.c | |
parent | t6019: demonstrate --ancestry-path A...B breakage (diff) | |
download | tgif-a765499a0884375c47c78d0d1e2926e875074427.tar.xz |
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 'builtin/remote-ext.c')
0 files changed, 0 insertions, 0 deletions