undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/in-place-reverse-in-sequencer'

Browse Source 
Code clean-up.

* js/in-place-reverse-in-sequencer:
  sequencer: use reverse_commit_list() helper
This commit is contained in:
Junio C Hamano 2022-03-23 14:09:31 -07:00
commit 83510335c6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sequencer.c
View File

@ -3749,7 +3749,7 @@ static int do_merge(struct repository *r,
int run_commit_flags = 0; int run_commit_flags = 0;
struct strbuf ref_name = STRBUF_INIT; struct strbuf ref_name = STRBUF_INIT;
struct commit *head_commit, *merge_commit, *i; struct commit *head_commit, *merge_commit, *i;
struct commit_list *bases, *j, *reversed = NULL; struct commit_list *bases, *j;
struct commit_list *to_merge = NULL, **tail = &to_merge; struct commit_list *to_merge = NULL, **tail = &to_merge;
const char *strategy = !opts->xopts_nr && const char *strategy = !opts->xopts_nr &&
(!opts->strategy || (!opts->strategy ||
@ -3984,9 +3984,7 @@ static int do_merge(struct repository *r,
git_path_merge_head(r), 0); git_path_merge_head(r), 0);
write_message("no-ff", 5, git_path_merge_mode(r), 0); write_message("no-ff", 5, git_path_merge_mode(r), 0);
for (j = bases; j; j = j->next) bases = reverse_commit_list(bases);
commit_list_insert(j->item, &reversed);
free_commit_list(bases);
repo_read_index(r); repo_read_index(r);
init_merge_options(&o, r); init_merge_options(&o, r);
@ -4002,10 +4000,10 @@ static int do_merge(struct repository *r,
* update the index and working copy immediately. * update the index and working copy immediately.
*/ */
ret = merge_ort_recursive(&o, ret = merge_ort_recursive(&o,
head_commit, merge_commit, reversed, head_commit, merge_commit, bases,
&i); &i);
} else { } else {
ret = merge_recursive(&o, head_commit, merge_commit, reversed, ret = merge_recursive(&o, head_commit, merge_commit, bases,
&i); &i);
} }
if (ret <= 0) if (ret <= 0)