2007-07-14 23:14:45 +00:00
|
|
|
#include "builtin.h"
|
2005-04-17 19:18:17 +00:00
|
|
|
#include "cache.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2005-04-18 18:39:48 +00:00
|
|
|
#include "commit.h"
|
2023-03-21 06:25:54 +00:00
|
|
|
#include "gettext.h"
|
2023-02-24 00:09:27 +00:00
|
|
|
#include "hex.h"
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
#include "refs.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
2008-10-02 12:59:19 +00:00
|
|
|
#include "parse-options.h"
|
2018-06-29 01:21:58 +00:00
|
|
|
#include "repository.h"
|
2018-07-20 16:33:04 +00:00
|
|
|
#include "commit-reach.h"
|
2005-04-17 19:18:17 +00:00
|
|
|
|
2008-07-30 05:04:14 +00:00
|
|
|
static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
|
2006-06-29 13:16:46 +00:00
|
|
|
{
|
2017-11-07 20:39:44 +00:00
|
|
|
struct commit_list *result, *r;
|
2008-07-30 05:04:14 +00:00
|
|
|
|
2023-03-28 13:58:47 +00:00
|
|
|
result = repo_get_merge_bases_many_dirty(the_repository, rev[0],
|
|
|
|
rev_nr - 1, rev + 1);
|
2006-06-29 13:16:46 +00:00
|
|
|
|
|
|
|
if (!result)
|
|
|
|
return 1;
|
|
|
|
|
2017-11-07 20:39:44 +00:00
|
|
|
for (r = result; r; r = r->next) {
|
|
|
|
printf("%s\n", oid_to_hex(&r->item->object.oid));
|
2005-08-24 04:08:59 +00:00
|
|
|
if (!show_all)
|
2017-11-07 20:39:44 +00:00
|
|
|
break;
|
2005-08-24 04:08:59 +00:00
|
|
|
}
|
2006-06-29 13:16:46 +00:00
|
|
|
|
2017-11-07 20:39:44 +00:00
|
|
|
free_commit_list(result);
|
2005-08-24 04:08:59 +00:00
|
|
|
return 0;
|
2005-04-17 19:18:17 +00:00
|
|
|
}
|
|
|
|
|
2008-10-02 12:59:19 +00:00
|
|
|
static const char * const merge_base_usage[] = {
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("git merge-base [-a | --all] <commit> <commit>..."),
|
|
|
|
N_("git merge-base [-a | --all] --octopus <commit>..."),
|
2012-09-11 18:35:26 +00:00
|
|
|
N_("git merge-base --is-ancestor <commit> <commit>"),
|
2022-10-13 15:39:12 +00:00
|
|
|
N_("git merge-base --independent <commit>..."),
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
N_("git merge-base --fork-point <ref> [<commit>]"),
|
2008-10-02 12:59:19 +00:00
|
|
|
NULL
|
|
|
|
};
|
2005-08-24 04:08:59 +00:00
|
|
|
|
2008-07-29 05:42:53 +00:00
|
|
|
static struct commit *get_commit_reference(const char *arg)
|
|
|
|
{
|
2017-02-21 23:47:36 +00:00
|
|
|
struct object_id revkey;
|
2008-07-29 05:42:53 +00:00
|
|
|
struct commit *r;
|
|
|
|
|
2023-03-28 13:58:46 +00:00
|
|
|
if (repo_get_oid(the_repository, arg, &revkey))
|
2008-07-29 05:42:53 +00:00
|
|
|
die("Not a valid object name %s", arg);
|
2018-06-29 01:21:58 +00:00
|
|
|
r = lookup_commit_reference(the_repository, &revkey);
|
2008-07-29 05:42:53 +00:00
|
|
|
if (!r)
|
|
|
|
die("Not a valid commit name %s", arg);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2013-12-30 19:37:49 +00:00
|
|
|
static int handle_independent(int count, const char **args)
|
2010-08-17 07:01:15 +00:00
|
|
|
{
|
2017-11-07 20:39:44 +00:00
|
|
|
struct commit_list *revs = NULL, *rev;
|
2010-08-17 07:01:15 +00:00
|
|
|
int i;
|
|
|
|
|
2013-12-30 19:37:49 +00:00
|
|
|
for (i = count - 1; i >= 0; i--)
|
|
|
|
commit_list_insert(get_commit_reference(args[i]), &revs);
|
|
|
|
|
2017-11-07 20:39:45 +00:00
|
|
|
reduce_heads_replace(&revs);
|
2017-11-07 20:39:44 +00:00
|
|
|
|
|
|
|
if (!revs)
|
2013-12-30 19:37:49 +00:00
|
|
|
return 1;
|
|
|
|
|
2017-11-07 20:39:44 +00:00
|
|
|
for (rev = revs; rev; rev = rev->next)
|
|
|
|
printf("%s\n", oid_to_hex(&rev->item->object.oid));
|
|
|
|
|
|
|
|
free_commit_list(revs);
|
2013-12-30 19:37:49 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int handle_octopus(int count, const char **args, int show_all)
|
|
|
|
{
|
|
|
|
struct commit_list *revs = NULL;
|
2017-11-07 20:39:44 +00:00
|
|
|
struct commit_list *result, *rev;
|
2013-12-30 19:37:49 +00:00
|
|
|
int i;
|
2010-08-17 07:01:54 +00:00
|
|
|
|
|
|
|
for (i = count - 1; i >= 0; i--)
|
2010-08-17 07:01:15 +00:00
|
|
|
commit_list_insert(get_commit_reference(args[i]), &revs);
|
2010-08-17 07:01:54 +00:00
|
|
|
|
2017-11-07 20:39:45 +00:00
|
|
|
result = get_octopus_merge_bases(revs);
|
|
|
|
free_commit_list(revs);
|
|
|
|
reduce_heads_replace(&result);
|
2010-08-17 07:01:15 +00:00
|
|
|
|
|
|
|
if (!result)
|
|
|
|
return 1;
|
|
|
|
|
2017-11-07 20:39:44 +00:00
|
|
|
for (rev = result; rev; rev = rev->next) {
|
|
|
|
printf("%s\n", oid_to_hex(&rev->item->object.oid));
|
2010-08-17 07:01:15 +00:00
|
|
|
if (!show_all)
|
2017-11-07 20:39:44 +00:00
|
|
|
break;
|
2010-08-17 07:01:15 +00:00
|
|
|
}
|
|
|
|
|
2017-11-07 20:39:44 +00:00
|
|
|
free_commit_list(result);
|
2010-08-17 07:01:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-30 21:52:20 +00:00
|
|
|
static int handle_is_ancestor(int argc, const char **argv)
|
|
|
|
{
|
|
|
|
struct commit *one, *two;
|
|
|
|
|
|
|
|
if (argc != 2)
|
|
|
|
die("--is-ancestor takes exactly two commits");
|
|
|
|
one = get_commit_reference(argv[0]);
|
|
|
|
two = get_commit_reference(argv[1]);
|
2023-03-28 13:58:47 +00:00
|
|
|
if (repo_in_merge_bases(the_repository, one, two))
|
2012-08-30 21:52:20 +00:00
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
static int handle_fork_point(int argc, const char **argv)
|
|
|
|
{
|
2017-02-21 23:47:36 +00:00
|
|
|
struct object_id oid;
|
2018-09-04 22:00:08 +00:00
|
|
|
struct commit *derived, *fork_point;
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
const char *commitname;
|
|
|
|
|
|
|
|
commitname = (argc == 2) ? argv[1] : "HEAD";
|
2023-03-28 13:58:46 +00:00
|
|
|
if (repo_get_oid(the_repository, commitname, &oid))
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
die("Not a valid object name: '%s'", commitname);
|
|
|
|
|
2018-06-29 01:21:58 +00:00
|
|
|
derived = lookup_commit_reference(the_repository, &oid);
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
|
2019-12-09 18:51:47 +00:00
|
|
|
fork_point = get_fork_point(argv[0], derived);
|
2016-10-12 20:10:40 +00:00
|
|
|
|
2018-09-04 22:00:08 +00:00
|
|
|
if (!fork_point)
|
|
|
|
return 1;
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
|
2018-09-04 22:00:08 +00:00
|
|
|
printf("%s\n", oid_to_hex(&fork_point->object.oid));
|
|
|
|
return 0;
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
}
|
|
|
|
|
2007-01-09 08:50:02 +00:00
|
|
|
int cmd_merge_base(int argc, const char **argv, const char *prefix)
|
2005-04-17 19:18:17 +00:00
|
|
|
{
|
2008-07-30 05:04:14 +00:00
|
|
|
struct commit **rev;
|
|
|
|
int rev_nr = 0;
|
2007-01-09 08:50:02 +00:00
|
|
|
int show_all = 0;
|
2013-10-23 23:10:25 +00:00
|
|
|
int cmdmode = 0;
|
2022-03-04 18:32:05 +00:00
|
|
|
int ret;
|
2005-04-17 19:18:17 +00:00
|
|
|
|
2008-10-02 12:59:19 +00:00
|
|
|
struct option options[] = {
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL('a', "all", &show_all, N_("output all common ancestors")),
|
2013-10-23 23:10:25 +00:00
|
|
|
OPT_CMDMODE(0, "octopus", &cmdmode,
|
|
|
|
N_("find ancestors for a single n-way merge"), 'o'),
|
|
|
|
OPT_CMDMODE(0, "independent", &cmdmode,
|
|
|
|
N_("list revs not reachable from others"), 'r'),
|
|
|
|
OPT_CMDMODE(0, "is-ancestor", &cmdmode,
|
|
|
|
N_("is the first one ancestor of the other?"), 'a'),
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
OPT_CMDMODE(0, "fork-point", &cmdmode,
|
|
|
|
N_("find where <commit> forked from reflog of <ref>"), 'f'),
|
2008-10-02 12:59:19 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
2008-07-30 05:04:14 +00:00
|
|
|
|
2008-10-02 12:59:19 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
|
2013-10-23 23:10:25 +00:00
|
|
|
|
|
|
|
if (cmdmode == 'a') {
|
|
|
|
if (argc < 2)
|
|
|
|
usage_with_options(merge_base_usage, options);
|
|
|
|
if (show_all)
|
2022-01-31 22:07:46 +00:00
|
|
|
die(_("options '%s' and '%s' cannot be used together"),
|
|
|
|
"--is-ancestor", "--all");
|
2012-08-30 21:52:20 +00:00
|
|
|
return handle_is_ancestor(argc, argv);
|
2013-10-23 23:10:25 +00:00
|
|
|
}
|
2010-08-17 07:01:15 +00:00
|
|
|
|
2013-10-23 23:10:25 +00:00
|
|
|
if (cmdmode == 'r' && show_all)
|
2022-01-31 22:07:46 +00:00
|
|
|
die(_("options '%s' and '%s' cannot be used together"),
|
|
|
|
"--independent", "--all");
|
2013-10-23 23:10:25 +00:00
|
|
|
|
2014-01-10 18:33:32 +00:00
|
|
|
if (cmdmode == 'o')
|
2013-12-30 19:37:49 +00:00
|
|
|
return handle_octopus(argc, argv, show_all);
|
2014-01-10 18:33:32 +00:00
|
|
|
|
|
|
|
if (cmdmode == 'r')
|
2013-12-30 19:37:49 +00:00
|
|
|
return handle_independent(argc, argv);
|
2013-10-23 23:10:25 +00:00
|
|
|
|
merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt. For example, if the history looked like this:
o---B1
/
---o---o---B2--o---o---o---Base
\
B3
\
Derived
where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".
Internally, we have get_merge_bases_many() that can compute this
with one-go. We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base". When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".
Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.
Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 23:47:32 +00:00
|
|
|
if (cmdmode == 'f') {
|
|
|
|
if (argc < 1 || 2 < argc)
|
|
|
|
usage_with_options(merge_base_usage, options);
|
|
|
|
return handle_fork_point(argc, argv);
|
|
|
|
}
|
|
|
|
|
2013-10-23 23:10:25 +00:00
|
|
|
if (argc < 2)
|
|
|
|
usage_with_options(merge_base_usage, options);
|
2010-08-17 07:01:15 +00:00
|
|
|
|
2016-02-22 22:44:25 +00:00
|
|
|
ALLOC_ARRAY(rev, argc);
|
2008-10-02 12:59:19 +00:00
|
|
|
while (argc-- > 0)
|
|
|
|
rev[rev_nr++] = get_commit_reference(*argv++);
|
2022-03-04 18:32:05 +00:00
|
|
|
ret = show_merge_base(rev, rev_nr, show_all);
|
|
|
|
free(rev);
|
|
|
|
return ret;
|
2005-04-17 19:18:17 +00:00
|
|
|
}
|