path: root/commit.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 /commit.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 'commit.c')
1 files changed, 13 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index 40890ae..016f14f 100644
--- a/commit.c
+++ b/commit.c
@@ -903,12 +903,22 @@ struct commit *get_fork_point(const char *refname, struct commit *commit)
struct commit_list *bases;
int i;
struct commit *ret = NULL;
+ char *full_refname;
+ switch (dwim_ref(refname, strlen(refname), &oid, &full_refname)) {
+ case 0:
+ die("No such ref: '%s'", refname);
+ case 1:
+ break; /* good */
+ default:
+ die("Ambiguous refname: '%s'", refname);
+ }
memset(&revs, 0, sizeof(revs));
revs.initial = 1;
- for_each_reflog_ent(refname, collect_one_reflog_ent, &revs);
+ for_each_reflog_ent(full_refname, collect_one_reflog_ent, &revs);
- if (! && !get_oid(refname, &oid))
+ if (!
add_one_commit(&oid, &revs);
for (i = 0; i <; i++)
@@ -934,6 +944,7 @@ struct commit *get_fork_point(const char *refname, struct commit *commit)
+ free(full_refname);
return ret;