mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![Elijah Newren](/assets/img/avatar_default.png)
In commit 259ccb6cc3
("merge-recursive: rename merge_options argument
from 'o' to 'opt'", 2019-04-05), I renamed a bunch of function
arguments in merge-recursive.c, but forgot to make that same change to
merge-recursive.h. Make the two match.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
120 lines
3.4 KiB
C
120 lines
3.4 KiB
C
#ifndef MERGE_RECURSIVE_H
|
|
#define MERGE_RECURSIVE_H
|
|
|
|
#include "string-list.h"
|
|
#include "unpack-trees.h"
|
|
|
|
struct commit;
|
|
|
|
struct repository;
|
|
|
|
struct merge_options {
|
|
const char *ancestor;
|
|
const char *branch1;
|
|
const char *branch2;
|
|
enum {
|
|
MERGE_RECURSIVE_NORMAL = 0,
|
|
MERGE_RECURSIVE_OURS,
|
|
MERGE_RECURSIVE_THEIRS
|
|
} recursive_variant;
|
|
const char *subtree_shift;
|
|
unsigned buffer_output; /* 1: output at end, 2: keep buffered */
|
|
unsigned renormalize : 1;
|
|
long xdl_opts;
|
|
int verbosity;
|
|
enum {
|
|
MERGE_DIRECTORY_RENAMES_NONE = 0,
|
|
MERGE_DIRECTORY_RENAMES_CONFLICT = 1,
|
|
MERGE_DIRECTORY_RENAMES_TRUE = 2
|
|
} detect_directory_renames;
|
|
int diff_detect_rename;
|
|
int merge_detect_rename;
|
|
int diff_rename_limit;
|
|
int merge_rename_limit;
|
|
int rename_score;
|
|
int needed_rename_limit;
|
|
int show_rename_progress;
|
|
int call_depth;
|
|
struct strbuf obuf;
|
|
struct hashmap current_file_dir_set;
|
|
struct string_list df_conflict_file_set;
|
|
struct unpack_trees_options unpack_opts;
|
|
struct index_state orig_index;
|
|
struct repository *repo;
|
|
};
|
|
|
|
/*
|
|
* For dir_rename_entry, directory names are stored as a full path from the
|
|
* toplevel of the repository and do not include a trailing '/'. Also:
|
|
*
|
|
* dir: original name of directory being renamed
|
|
* non_unique_new_dir: if true, could not determine new_dir
|
|
* new_dir: final name of directory being renamed
|
|
* possible_new_dirs: temporary used to help determine new_dir; see comments
|
|
* in get_directory_renames() for details
|
|
*/
|
|
struct dir_rename_entry {
|
|
struct hashmap_entry ent; /* must be the first member! */
|
|
char *dir;
|
|
unsigned non_unique_new_dir:1;
|
|
struct strbuf new_dir;
|
|
struct string_list possible_new_dirs;
|
|
};
|
|
|
|
struct collision_entry {
|
|
struct hashmap_entry ent; /* must be the first member! */
|
|
char *target_file;
|
|
struct string_list source_files;
|
|
unsigned reported_already:1;
|
|
};
|
|
|
|
static inline int merge_detect_rename(struct merge_options *opt)
|
|
{
|
|
return opt->merge_detect_rename >= 0 ? opt->merge_detect_rename :
|
|
opt->diff_detect_rename >= 0 ? opt->diff_detect_rename : 1;
|
|
}
|
|
|
|
/*
|
|
* merge_recursive is like merge_trees() but with recursive ancestor
|
|
* consolidation, and when successful, it creates an actual commit
|
|
* and writes its address to *result.
|
|
*
|
|
* NOTE: empirically, about a decade ago it was determined that with more
|
|
* than two merge bases, optimal behavior was found when the
|
|
* 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 *opt,
|
|
struct commit *h1,
|
|
struct commit *h2,
|
|
struct commit_list *merge_bases,
|
|
struct commit **result);
|
|
|
|
/*
|
|
* rename-detecting three-way merge, no recursion; result of merge is written
|
|
* to opt->repo->index.
|
|
*/
|
|
int merge_trees(struct merge_options *opt,
|
|
struct tree *head,
|
|
struct tree *merge,
|
|
struct tree *merge_base);
|
|
|
|
/*
|
|
* "git-merge-recursive" can be fed trees; wrap them into
|
|
* virtual commits and call merge_recursive() proper.
|
|
*/
|
|
int merge_recursive_generic(struct merge_options *opt,
|
|
const struct object_id *head,
|
|
const struct object_id *merge,
|
|
int num_merge_bases,
|
|
const struct object_id **merge_bases,
|
|
struct commit **result);
|
|
|
|
void init_merge_options(struct merge_options *opt,
|
|
struct repository *repo);
|
|
|
|
int parse_merge_opt(struct merge_options *opt, const char *s);
|
|
|
|
#endif
|