diff options
| -rw-r--r-- | builtin/merge-tree.c | 2 | ||||
| -rw-r--r-- | builtin/stash.c | 2 | ||||
| -rw-r--r-- | commit.c | 2 | ||||
| -rw-r--r-- | commit.h | 7 | ||||
| -rw-r--r-- | merge-ort.c | 2 | ||||
| -rw-r--r-- | sequencer.c | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 1c063d9a41..979a55d3b2 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -483,7 +483,7 @@ static int real_merge(struct merge_tree_options *o, exit(128); if (!merge_bases && !o->allow_unrelated_histories) die(_("refusing to merge unrelated histories")); - merge_bases = reverse_commit_list(merge_bases); + merge_bases = commit_list_reverse(merge_bases); merge_incore_recursive(&opt, merge_bases, parent1, parent2, &result); free_commit_list(merge_bases); } diff --git a/builtin/stash.c b/builtin/stash.c index 948eba06fb..4cb2351787 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -2308,7 +2308,7 @@ static int do_export_stash(struct repository *r, * but where their first parents form a chain to our original empty * base commit. */ - items = reverse_commit_list(items); + items = commit_list_reverse(items); for (cur = items; cur; cur = cur->next) { struct commit_list *parents = NULL; struct commit_list **next = &parents; @@ -691,7 +691,7 @@ struct commit_list *commit_list_copy(const struct commit_list *list) return head; } -struct commit_list *reverse_commit_list(struct commit_list *list) +struct commit_list *commit_list_reverse(struct commit_list *list) { struct commit_list *next = NULL, *current, *backup; for (current = list; current; current = backup) { @@ -189,7 +189,7 @@ void commit_list_sort_by_date(struct commit_list **list); struct commit_list *commit_list_copy(const struct commit_list *list); /* Modify list in-place to reverse it, returning new head; list will be tail */ -struct commit_list *reverse_commit_list(struct commit_list *list); +struct commit_list *commit_list_reverse(struct commit_list *list); void free_commit_list(struct commit_list *list); @@ -202,6 +202,11 @@ static inline struct commit_list *copy_commit_list(struct commit_list *l) return commit_list_copy(l); } +static inline struct commit_list *reverse_commit_list(struct commit_list *l) +{ + return commit_list_reverse(l); +} + struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ const char *repo_logmsg_reencode(struct repository *r, diff --git a/merge-ort.c b/merge-ort.c index f31754c361..2ddaaffc26 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -5314,7 +5314,7 @@ static void merge_ort_internal(struct merge_options *opt, goto out; } /* See merge-ort.h:merge_incore_recursive() declaration NOTE */ - merge_bases = reverse_commit_list(merge_bases); + merge_bases = commit_list_reverse(merge_bases); } merged_merge_bases = pop_commit(&merge_bases); diff --git a/sequencer.c b/sequencer.c index f38d247b10..e09f8eed55 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4317,7 +4317,7 @@ static int do_merge(struct repository *r, git_path_merge_head(r), 0); write_message("no-ff", 5, git_path_merge_mode(r), 0); - bases = reverse_commit_list(bases); + bases = commit_list_reverse(bases); repo_read_index(r); init_ui_merge_options(&o, r); |