mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'at/rebase-fork-point-regression-fix'

Browse Source 
The "--fork-point" mode of "git rebase" regressed when the command
was rewritten in C back in 2.20 era, which has been corrected.

* at/rebase-fork-point-regression-fix:
  rebase: --fork-point regression fix
This commit is contained in:
Junio C Hamano
2020-03-26 17:11:21 -07:00
parent 4e4baee3f4 f08132f889
commit fb4175b0e4
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
commit.c
View File

@ -927,12 +927,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 (!revs.nr && !get_oid(refname, &oid))
if (!revs.nr)
add_one_commit(&oid, &revs);
for (i = 0; i < revs.nr; i++)
@ -958,6 +968,7 @@ struct commit *get_fork_point(const char *refname, struct commit *commit)
cleanup_return:
free_commit_list(bases);
free(full_refname);
return ret;
}