path: root/builtin/merge-base.c
diff options
authorJunio C Hamano <>2019-12-09 18:51:47 (GMT)
committerJunio C Hamano <>2020-02-11 17:59:39 (GMT)
commitf08132f889c00a8108f61541e047649ad0e660e4 (patch)
treef5e3a0f2b336c05ffbedc12238968ebdf2ca70e4 /builtin/merge-base.c
parentda72936f544fec5a335e66432610e4cef4430991 (diff)
rebase: --fork-point regression fix
"git rebase --fork-point master" used to work OK, as it internally called "git merge-base --fork-point" that knew how to handle short refname and dwim it to the full refname before calling the underlying get_fork_point() function. This is no longer true after the command was rewritten in C, as its internall call made directly to get_fork_point() does not dwim a short ref. Move the "dwim the refname argument to the full refname" logic that is used in "git merge-base" to the underlying get_fork_point() function, so that the other caller of the function in the implementation of "git rebase" behaves the same way to fix this regression. Signed-off-by: Alex Torok <> [jc: revamped the fix and used Alex's tests] Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/merge-base.c')
1 files changed, 1 insertions, 11 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index e3f8da1..6719ac1 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -114,26 +114,16 @@ static int handle_is_ancestor(int argc, const char **argv)
static int handle_fork_point(int argc, const char **argv)
struct object_id oid;
- char *refname;
struct commit *derived, *fork_point;
const char *commitname;
- switch (dwim_ref(argv[0], strlen(argv[0]), &oid, &refname)) {
- case 0:
- die("No such ref: '%s'", argv[0]);
- case 1:
- break; /* good */
- default:
- die("Ambiguous refname: '%s'", argv[0]);
- }
commitname = (argc == 2) ? argv[1] : "HEAD";
if (get_oid(commitname, &oid))
die("Not a valid object name: '%s'", commitname);
derived = lookup_commit_reference(the_repository, &oid);
- fork_point = get_fork_point(refname, derived);
+ fork_point = get_fork_point(argv[0], derived);
if (!fork_point)
return 1;