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>
This commit is contained in:
committed by
Junio C Hamano
parent
f659031c1c
commit
a765499a08
@ -35,6 +35,7 @@ struct rev_cmdline_info {
|
||||
REV_CMD_PARENTS_ONLY,
|
||||
REV_CMD_LEFT,
|
||||
REV_CMD_RIGHT,
|
||||
REV_CMD_MERGE_BASE,
|
||||
REV_CMD_REV
|
||||
} whence;
|
||||
unsigned flags;
|
||||
|
||||
Reference in New Issue
Block a user