diff options
| author | Elijah Newren <newren@gmail.com> | 2019-08-17 18:41:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 17:08:03 (GMT) |
| commit | ff1bfa2cd5693900a84750dc47cda3cee3cf6ba7 (patch) | |
| tree | 8007ffb36bb8cec347919b40ac2e1a72f142919d /merge-recursive.h | |
| parent | 4d7101e25cfd5fba24ddc310f10c3962edba8b4d (diff) | |
| download | git-ff1bfa2cd5693900a84750dc47cda3cee3cf6ba7.zip git-ff1bfa2cd5693900a84750dc47cda3cee3cf6ba7.tar.gz git-ff1bfa2cd5693900a84750dc47cda3cee3cf6ba7.tar.bz2 | |
merge-recursive: use common name for ancestors/common/base_list
merge_trees(), merge_recursive(), and merge_recursive_generic() in
their function headers used four different names for the merge base or
list of merge bases they were passed:
* 'common'
* 'ancestors'
* 'ca'
* 'base_list'
They were able to refer to it four different ways instead of only three
by using a different name in the signature for the .c file than the .h
file. Change all of these to 'merge_base' or 'merge_bases'.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index 0a3033b..6f35109 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -81,14 +81,14 @@ static inline int merge_detect_rename(struct merge_options *o) * * NOTE: empirically, about a decade ago it was determined that with more * than two merge bases, optimal behavior was found when the - * ancestors were passed in the order of oldest merge base to newest - * one. Also, ancestors will be consumed (emptied) so make a copy if - * you need it. + * merge_bases were passed in the order of oldest commit to newest + * commit. Also, merge_bases will be consumed (emptied) so make a + * copy if you need it. */ int merge_recursive(struct merge_options *o, struct commit *h1, struct commit *h2, - struct commit_list *ancestors, + struct commit_list *merge_bases, struct commit **result); /* @@ -98,7 +98,7 @@ int merge_recursive(struct merge_options *o, int merge_trees(struct merge_options *o, struct tree *head, struct tree *merge, - struct tree *common); + struct tree *merge_base); /* * "git-merge-recursive" can be fed trees; wrap them into @@ -107,8 +107,8 @@ int merge_trees(struct merge_options *o, int merge_recursive_generic(struct merge_options *o, const struct object_id *head, const struct object_id *merge, - int num_ca, - const struct object_id **ca, + int num_merge_bases, + const struct object_id **merge_bases, struct commit **result); void init_merge_options(struct merge_options *o, |