in_merge_bases(): support only one "other" commit

In early days of its life, I planned to make it possible to compute
"is a commit contained in all of these other commits?" with this
function, but it turned out that no caller needed it.

Just make it take two commit objects and add a comment to say what
these two functions do.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index d8cccf725d3fab24ad585a26629373fc987bb3f8..98fa5d628477ddcd02e557d5dd594f92b4a09c9e 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -122,7 +122,7 @@ static int branch_merged(int kind, const char *name,
        if (!reference_rev)
                reference_rev = head_rev;
 
        if (!reference_rev)
                reference_rev = head_rev;
 

-       merged = in_merge_bases(rev, &reference_rev, 1);
+       merged = in_merge_bases(rev, reference_rev);

 
        /*
         * After the safety valve is fully redefined to "check with
 
        /*
         * After the safety valve is fully redefined to "check with


@@ -132,7 +132,7 @@ static int branch_merged(int kind, const char *name,
         * a gentle reminder is in order.
         */
        if ((head_rev != reference_rev) &&
         * a gentle reminder is in order.
         */
        if ((head_rev != reference_rev) &&

-           in_merge_bases(rev, &head_rev, 1) != merged) {
+           in_merge_bases(rev, head_rev) != merged) {

                if (merged)
                        warning(_("deleting branch '%s' that has been merged to\n"
                                "         '%s', but not yet merged to HEAD."),
                if (merged)
                        warning(_("deleting branch '%s' that has been merged to\n"
                                "         '%s', but not yet merged to HEAD."),

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 8ec4eae3eb78925de41253264380ea5585b0f091..97327e6cc6f5e890c7e10174d7bea5c41d96b28e 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -314,7 +314,7 @@ static int update_local_ref(struct ref *ref,
                return r;
        }
 
                return r;
        }
 

-       if (in_merge_bases(current, &updated, 1)) {
+       if (in_merge_bases(current, updated)) {

                char quickref[83];
                int r;
                strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
                char quickref[83];
                int r;
                strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));

diff --git a/commit.c b/commit.c
index 35af4988f0ff83c6a3379ea9f6de4e4e1568c39f..0a05a1075ad228f1f38f61cc5278edeb8604ebfb 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -754,6 +754,9 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two,
        return get_merge_bases_many(one, 1, &two, cleanup);
 }
 
        return get_merge_bases_many(one, 1, &two, cleanup);
 }
 

+/*
+ * Is "commit" a decendant of one of the elements on the "with_commit" list?
+ */

 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
 {
        if (!with_commit)
 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
 {
        if (!with_commit)


@@ -763,21 +766,21 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
 
                other = with_commit->item;
                with_commit = with_commit->next;
 
                other = with_commit->item;
                with_commit = with_commit->next;

-               if (in_merge_bases(other, &commit, 1))
+               if (in_merge_bases(other, commit))

                        return 1;
        }
        return 0;
 }
 
                        return 1;
        }
        return 0;
 }
 

-int in_merge_bases(struct commit *commit, struct commit **reference, int num)
+/*
+ * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
+ */
+int in_merge_bases(struct commit *commit, struct commit *reference)

 {
        struct commit_list *bases, *b;
        int ret = 0;
 
 {
        struct commit_list *bases, *b;
        int ret = 0;
 

-       if (num == 1)
-               bases = get_merge_bases(commit, *reference, 1);
-       else
-               die("not yet");
+       bases = get_merge_bases(commit, reference, 1);

        for (b = bases; b; b = b->next) {
                if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
                        ret = 1;
        for (b = bases; b; b = b->next) {
                if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
                        ret = 1;

diff --git a/commit.h b/commit.h
index 154c0e34ff7d2dbaddcfb66b74d26697ffba6381..5bb8a884bd892489745af2308f6c9e1fe256d450 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -168,7 +168,7 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads,
                int depth, int shallow_flag, int not_shallow_flag);
 
 int is_descendant_of(struct commit *, struct commit_list *);
                int depth, int shallow_flag, int not_shallow_flag);
 
 int is_descendant_of(struct commit *, struct commit_list *);

-int in_merge_bases(struct commit *, struct commit **, int);
+int in_merge_bases(struct commit *, struct commit *);

 
 extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
 extern int run_add_interactive(const char *revision, const char *patch_mode,
 
 extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
 extern int run_add_interactive(const char *revision, const char *patch_mode,

diff --git a/contrib/examples/builtin-fetch--tool.c b/contrib/examples/builtin-fetch--tool.c
index 3140e405fa130a0fa20b2f6ee4171da70935de66..3038c390977092bcf105d8c237b965e618118662 100644 (file)
--- a/contrib/examples/builtin-fetch--tool.c
+++ b/contrib/examples/builtin-fetch--tool.c
@@ -96,7 +96,7 @@ static int update_local_ref(const char *name,
        strcpy(oldh, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
        strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
 
        strcpy(oldh, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
        strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
 

-       if (in_merge_bases(current, &updated, 1)) {
+       if (in_merge_bases(current, updated)) {

                fprintf(stderr, "* %s: fast-forward to %s\n",
                        name, note);
                fprintf(stderr, "  old..new: %s..%s\n", oldh, newh);
                fprintf(stderr, "* %s: fast-forward to %s\n",
                        name, note);
                fprintf(stderr, "  old..new: %s..%s\n", oldh, newh);

diff --git a/fast-import.c b/fast-import.c
index a85275dc682d2bb8068f003b8281c3933488f010..e6f61fc7cb404248c7d742346573874b3ec22226 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1691,7 +1691,7 @@ static int update_branch(struct branch *b)
                        return error("Branch %s is missing commits.", b->name);
                }
 
                        return error("Branch %s is missing commits.", b->name);
                }
 

-               if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
+               if (!in_merge_bases(old_cmit, new_cmit)) {

                        unlock_ref(lock);
                        warning("Not updating %s"
                                " (new tip %s does not contain %s)",
                        unlock_ref(lock);
                        warning("Not updating %s"
                                " (new tip %s does not contain %s)",

diff --git a/submodule.c b/submodule.c
index 9a2806067954c55a27c068706b5bfe67a1189fd5..8fc974d1cbb8901f6653335f046d33c944d48d2c 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -738,7 +738,7 @@ static int find_first_merges(struct object_array *result, const char *path,
                die("revision walk setup failed");
        while ((commit = get_revision(&revs)) != NULL) {
                struct object *o = &(commit->object);
                die("revision walk setup failed");
        while ((commit = get_revision(&revs)) != NULL) {
                struct object *o = &(commit->object);

-               if (in_merge_bases(b, &commit, 1))
+               if (in_merge_bases(b, commit))

                        add_object_array(o, NULL, &merges);
        }
 
                        add_object_array(o, NULL, &merges);
        }
 


@@ -752,7 +752,7 @@ static int find_first_merges(struct object_array *result, const char *path,
                contains_another = 0;
                for (j = 0; j < merges.nr; j++) {
                        struct commit *m2 = (struct commit *) merges.objects[j].item;
                contains_another = 0;
                for (j = 0; j < merges.nr; j++) {
                        struct commit *m2 = (struct commit *) merges.objects[j].item;

-                       if (i != j && in_merge_bases(m2, &m1, 1)) {
+                       if (i != j && in_merge_bases(m2, m1)) {

                                contains_another = 1;
                                break;
                        }
                                contains_another = 1;
                                break;
                        }


@@ -814,18 +814,18 @@ int merge_submodule(unsigned char result[20], const char *path,
        }
 
        /* check whether both changes are forward */
        }
 
        /* check whether both changes are forward */

-       if (!in_merge_bases(commit_base, &commit_a, 1) ||
-           !in_merge_bases(commit_base, &commit_b, 1)) {
+       if (!in_merge_bases(commit_base, commit_a) ||
+           !in_merge_bases(commit_base, commit_b)) {

                MERGE_WARNING(path, "commits don't follow merge-base");
                return 0;
        }
 
        /* Case #1: a is contained in b or vice versa */
                MERGE_WARNING(path, "commits don't follow merge-base");
                return 0;
        }
 
        /* Case #1: a is contained in b or vice versa */

-       if (in_merge_bases(commit_a, &commit_b, 1)) {
+       if (in_merge_bases(commit_a, commit_b)) {

                hashcpy(result, b);
                return 1;
        }
                hashcpy(result, b);
                return 1;
        }

-       if (in_merge_bases(commit_b, &commit_a, 1)) {
+       if (in_merge_bases(commit_b, commit_a)) {

                hashcpy(result, a);
                return 1;
        }
                hashcpy(result, a);
                return 1;
        }