diff options
author | Elijah Newren <newren@gmail.com> | 2019-08-17 21:41:37 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 20:08:04 +0300 |
commit | 7c0a6c8e477bd9009001590f49274e892e92fce8 (patch) | |
tree | 833598f74abcf6a5e383db0449620eaf7cdf01c1 /merge-recursive.c | |
parent | c749ab1da812cdb1263f868c63fe1808a12dcff2 (diff) |
merge-recursive: move some definitions around to clean up the header
No substantive code changes (view this with diff --color-moved), but
a few small code cleanups:
* Move structs and an inline function only used by merge-recursive.c
into merge-recursive.c
* Re-order function declarations to be more logical
* Add or fix some explanatory comments
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r-- | merge-recursive.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 1823a87706..9807b24c65 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -54,6 +54,24 @@ static unsigned int path_hash(const char *path) return ignore_case ? strihash(path) : strhash(path); } +/* + * 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; +}; + static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, char *dir) { @@ -92,6 +110,13 @@ static void dir_rename_entry_init(struct dir_rename_entry *entry, string_list_init(&entry->possible_new_dirs, 0); } +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 struct collision_entry *collision_find_entry(struct hashmap *hashmap, char *target_file) { @@ -358,6 +383,12 @@ static int add_cacheinfo(struct merge_options *opt, return ret; } +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; +} + static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree) { parse_tree(tree); |