Merge branch 'jc/merge-bases'
The get_merge_bases*() API was easy to misuse by careless copy&paste coders, leaving object flags tainted in the commits that needed to be traversed. * jc/merge-bases: get_merge_bases(): always clean-up object flags bisect: clean flags after checking merge bases
This commit is contained in:
commit
098501527f
2
bisect.c
2
bisect.c
@ -777,7 +777,7 @@ static void check_merge_bases(int no_checkout)
|
||||
int rev_nr;
|
||||
struct commit **rev = get_bad_and_good_commits(&rev_nr);
|
||||
|
||||
result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);
|
||||
result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
|
||||
|
||||
for (; result; result = result->next) {
|
||||
const unsigned char *mb = result->item->object.sha1;
|
||||
|
@ -10,7 +10,7 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
|
||||
{
|
||||
struct commit_list *result;
|
||||
|
||||
result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);
|
||||
result = get_merge_bases_many_dirty(rev[0], rev_nr - 1, rev + 1);
|
||||
|
||||
if (!result)
|
||||
return 1;
|
||||
@ -176,7 +176,7 @@ static int handle_fork_point(int argc, const char **argv)
|
||||
for (i = 0; i < revs.nr; i++)
|
||||
revs.commit[i]->object.flags &= ~TMP_MARK;
|
||||
|
||||
bases = get_merge_bases_many(derived, revs.nr, revs.commit, 0);
|
||||
bases = get_merge_bases_many_dirty(derived, revs.nr, revs.commit);
|
||||
|
||||
/*
|
||||
* There should be one and only one merge base, when we found
|
||||
|
@ -1312,7 +1312,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
|
||||
if (!remoteheads)
|
||||
; /* already up-to-date */
|
||||
else if (!remoteheads->next)
|
||||
common = get_merge_bases(head_commit, remoteheads->item, 1);
|
||||
common = get_merge_bases(head_commit, remoteheads->item);
|
||||
else {
|
||||
struct commit_list *list = remoteheads;
|
||||
commit_list_insert(head_commit, &list);
|
||||
@ -1409,7 +1409,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
|
||||
* merge_bases again, otherwise "git merge HEAD^
|
||||
* HEAD^^" would be missed.
|
||||
*/
|
||||
common_one = get_merge_bases(head_commit, j->item, 1);
|
||||
common_one = get_merge_bases(head_commit, j->item);
|
||||
if (hashcmp(common_one->item->object.sha1,
|
||||
j->item->object.sha1)) {
|
||||
up_to_date = 0;
|
||||
|
@ -279,7 +279,7 @@ static int try_difference(const char *arg)
|
||||
struct commit *a, *b;
|
||||
a = lookup_commit_reference(sha1);
|
||||
b = lookup_commit_reference(end);
|
||||
exclude = get_merge_bases(a, b, 1);
|
||||
exclude = get_merge_bases(a, b);
|
||||
while (exclude) {
|
||||
struct commit_list *n = exclude->next;
|
||||
show_rev(REVERSED,
|
||||
|
29
commit.c
29
commit.c
@ -867,7 +867,7 @@ struct commit_list *get_octopus_merge_bases(struct commit_list *in)
|
||||
|
||||
for (j = ret; j; j = j->next) {
|
||||
struct commit_list *bases;
|
||||
bases = get_merge_bases(i->item, j->item, 1);
|
||||
bases = get_merge_bases(i->item, j->item);
|
||||
if (!new)
|
||||
new = bases;
|
||||
else
|
||||
@ -936,10 +936,10 @@ static int remove_redundant(struct commit **array, int cnt)
|
||||
return filled;
|
||||
}
|
||||
|
||||
struct commit_list *get_merge_bases_many(struct commit *one,
|
||||
int n,
|
||||
struct commit **twos,
|
||||
int cleanup)
|
||||
static struct commit_list *get_merge_bases_many_0(struct commit *one,
|
||||
int n,
|
||||
struct commit **twos,
|
||||
int cleanup)
|
||||
{
|
||||
struct commit_list *list;
|
||||
struct commit **rslt;
|
||||
@ -977,10 +977,23 @@ struct commit_list *get_merge_bases_many(struct commit *one,
|
||||
return result;
|
||||
}
|
||||
|
||||
struct commit_list *get_merge_bases(struct commit *one, struct commit *two,
|
||||
int cleanup)
|
||||
struct commit_list *get_merge_bases_many(struct commit *one,
|
||||
int n,
|
||||
struct commit **twos)
|
||||
{
|
||||
return get_merge_bases_many(one, 1, &two, cleanup);
|
||||
return get_merge_bases_many_0(one, n, twos, 1);
|
||||
}
|
||||
|
||||
struct commit_list *get_merge_bases_many_dirty(struct commit *one,
|
||||
int n,
|
||||
struct commit **twos)
|
||||
{
|
||||
return get_merge_bases_many_0(one, n, twos, 0);
|
||||
}
|
||||
|
||||
struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
|
||||
{
|
||||
return get_merge_bases_many_0(one, 1, &two, 1);
|
||||
}
|
||||
|
||||
/*
|
||||
|
7
commit.h
7
commit.h
@ -236,10 +236,13 @@ struct commit_graft *read_graft_line(char *buf, int len);
|
||||
int register_commit_graft(struct commit_graft *, int);
|
||||
struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
|
||||
|
||||
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
|
||||
extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
|
||||
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
|
||||
extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
|
||||
extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
|
||||
|
||||
/* To be used only when object flags after this call no longer matter */
|
||||
extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
|
||||
|
||||
/* largest positive number a signed 32-bit integer can contain */
|
||||
#define INFINITE_DEPTH 0x7fffffff
|
||||
|
||||
|
@ -1901,7 +1901,7 @@ int merge_recursive(struct merge_options *o,
|
||||
}
|
||||
|
||||
if (!ca) {
|
||||
ca = get_merge_bases(h1, h2, 1);
|
||||
ca = get_merge_bases(h1, h2);
|
||||
ca = reverse_commit_list(ca);
|
||||
}
|
||||
|
||||
|
@ -594,7 +594,7 @@ int notes_merge(struct notes_merge_options *o,
|
||||
assert(local && remote);
|
||||
|
||||
/* Find merge bases */
|
||||
bases = get_merge_bases(local, remote, 1);
|
||||
bases = get_merge_bases(local, remote);
|
||||
if (!bases) {
|
||||
base_sha1 = null_sha1;
|
||||
base_tree_sha1 = EMPTY_TREE_SHA1_BIN;
|
||||
|
@ -1441,7 +1441,7 @@ static void prepare_show_merge(struct rev_info *revs)
|
||||
other = lookup_commit_or_die(sha1, "MERGE_HEAD");
|
||||
add_pending_object(revs, &head->object, "HEAD");
|
||||
add_pending_object(revs, &other->object, "MERGE_HEAD");
|
||||
bases = get_merge_bases(head, other, 1);
|
||||
bases = get_merge_bases(head, other);
|
||||
add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
|
||||
add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
|
||||
free_commit_list(bases);
|
||||
@ -1546,7 +1546,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
|
||||
: lookup_commit_reference(b_obj->sha1));
|
||||
if (!a || !b)
|
||||
goto missing;
|
||||
exclude = get_merge_bases(a, b, 1);
|
||||
exclude = get_merge_bases(a, b);
|
||||
add_rev_cmdline_list(revs, exclude,
|
||||
REV_CMD_MERGE_BASE,
|
||||
flags_exclude);
|
||||
|
@ -993,7 +993,7 @@ int get_sha1_mb(const char *name, unsigned char *sha1)
|
||||
two = lookup_commit_reference_gently(sha1_tmp, 0);
|
||||
if (!two)
|
||||
return -1;
|
||||
mbs = get_merge_bases(one, two, 1);
|
||||
mbs = get_merge_bases(one, two);
|
||||
if (!mbs || mbs->next)
|
||||
st = -1;
|
||||
else {
|
||||
|
@ -301,7 +301,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
|
||||
left->object.flags |= SYMMETRIC_LEFT;
|
||||
add_pending_object(rev, &left->object, path);
|
||||
add_pending_object(rev, &right->object, path);
|
||||
merge_bases = get_merge_bases(left, right, 1);
|
||||
merge_bases = get_merge_bases(left, right);
|
||||
if (merge_bases) {
|
||||
if (merge_bases->item == left)
|
||||
*fast_forward = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user