@matheusbsbs / matheus-bagliano / commits / a765499a08

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>

Kevin Bracey committed May 13, 2013 at 18:00 UTC a765499a0884375c47c78d0d1e2926e875074427

3 files changed +19 -1

revision.c

+17

@@ -915,6 +915,19 @@ static void add_rev_cmdline(struct rev_info *revs,

915 info->nr++;

916 }

917

918 +static void add_rev_cmdline_list(struct rev_info *revs,

919 + struct commit_list *commit_list,

920 + int whence,

921 + unsigned flags)

922 +{

923 + while (commit_list) {

924 + struct object *object = &commit_list->item->object;

925 + add_rev_cmdline(revs, object, sha1_to_hex(object->sha1),

926 + whence, flags);

927 + commit_list = commit_list->next;

928 + }

929 +}

930 +

931 struct all_refs_cb {

932 int all_flags;

933 int warned_bad_reflog;

@@ -1092,6 +1105,7 @@ static void prepare_show_merge(struct rev_info *revs)

1105 add_pending_object(revs, &head->object, "HEAD");

1106 add_pending_object(revs, &other->object, "MERGE_HEAD");

1107 bases = get_merge_bases(head, other, 1);

1108 + add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING);

1109 add_pending_commit_list(revs, bases, UNINTERESTING);

1110 free_commit_list(bases);

1111 head->object.flags |= SYMMETRIC_LEFT;

@@ -1179,6 +1193,9 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi

1193

1194 if (symmetric) {

1195 exclude = get_merge_bases(a, b, 1);

1196 + add_rev_cmdline_list(revs, exclude,

1197 + REV_CMD_MERGE_BASE,

1198 + flags_exclude);

1199 add_pending_commit_list(revs, exclude,

1200 flags_exclude);

1201 free_commit_list(exclude);

revision.h

@@ -35,6 +35,7 @@ struct rev_cmdline_info {

35 REV_CMD_PARENTS_ONLY,

36 REV_CMD_LEFT,

37 REV_CMD_RIGHT,

38 + REV_CMD_MERGE_BASE,

39 REV_CMD_REV

40 } whence;

41 unsigned flags;

t/t6019-rev-list-ancestry-path.sh

+1 -1

@@ -81,7 +81,7 @@ test_expect_success 'rev-list F...I' '

81 test_cmp expect actual

82 '

84 -test_expect_failure 'rev-list --ancestry-path F...I' '

84 +test_expect_success 'rev-list --ancestry-path F...I' '

85 for c in F H I; do echo $c; done >expect &&

86 git rev-list --ancestry-path --format=%s F...I |

87 sed -e "/^commit /d" |