microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

merge-recursive: fix some overly long lines 

No substantive code change, just add some line breaks to fix lines that
have grown in length due to various refactorings.  Most remaining lines
of excessive length in merge-recursive include error messages and it's
not clear that splitting those improves things.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2019-08-17 11:41:33 -07:00 коммит произвёл Junio C Hamano
Родитель 724dd767b2
Коммит 4d7101e25c
1 изменённых файлов: 13 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
merge-recursive.c
Просмотреть файл

@ -681,7 +681,9 @@ static void add_flattened_path(struct strbuf *out, const char *s)
out->buf[i] = '_'; out->buf[i] = '_';
} }
static char *unique_path(struct merge_options *opt, const char *path, const char *branch) static char *unique_path(struct merge_options *opt,
const char *path,
const char *branch)
{ {
struct path_hashmap_entry *entry; struct path_hashmap_entry *entry;
struct strbuf newpath = STRBUF_INIT; struct strbuf newpath = STRBUF_INIT;
@ -915,7 +917,8 @@ static int update_file_flags(struct merge_options *opt,
} }
if (S_ISREG(contents->mode)) { if (S_ISREG(contents->mode)) {
struct strbuf strbuf = STRBUF_INIT; struct strbuf strbuf = STRBUF_INIT;
if (convert_to_working_tree(opt->repo->index, path, buf, size, &strbuf)) { if (convert_to_working_tree(opt->repo->index,
path, buf, size, &strbuf)) {
free(buf); free(buf);
size = strbuf.len; size = strbuf.len;
buf = strbuf_detach(&strbuf, NULL); buf = strbuf_detach(&strbuf, NULL);
@ -3393,7 +3396,8 @@ static int merge_trees_internal(struct merge_options *opt,
* opposed to decaring a local hashmap is for convenience * opposed to decaring a local hashmap is for convenience
* so that we don't have to pass it to around. * so that we don't have to pass it to around.
*/ */
hashmap_init(&opt->current_file_dir_set, path_hashmap_cmp, NULL, 512); hashmap_init(&opt->current_file_dir_set, path_hashmap_cmp,
NULL, 512);
get_files_dirs(opt, head); get_files_dirs(opt, head);
get_files_dirs(opt, merge); get_files_dirs(opt, merge);
@ -3502,7 +3506,8 @@ static int merge_recursive_internal(struct merge_options *opt,
struct tree *tree; struct tree *tree;
tree = lookup_tree(opt->repo, opt->repo->hash_algo->empty_tree); tree = lookup_tree(opt->repo, opt->repo->hash_algo->empty_tree);
merged_common_ancestors = make_virtual_commit(opt->repo, tree, "ancestor"); merged_common_ancestors = make_virtual_commit(opt->repo,
tree, "ancestor");
ancestor_name = "empty tree"; ancestor_name = "empty tree";
} else if (ca) { } else if (ca) {
ancestor_name = "merged common ancestors"; ancestor_name = "merged common ancestors";
@ -3625,7 +3630,8 @@ int merge_recursive(struct merge_options *opt,
return clean; return clean;
} }
static struct commit *get_ref(struct repository *repo, const struct object_id *oid, static struct commit *get_ref(struct repository *repo,
const struct object_id *oid,
const char *name) const char *name)
{ {
struct object *object; struct object *object;
@ -3660,7 +3666,8 @@ int merge_recursive_generic(struct merge_options *opt,
int i; int i;
for (i = 0; i < num_base_list; ++i) { for (i = 0; i < num_base_list; ++i) {
struct commit *base; struct commit *base;
if (!(base = get_ref(opt->repo, base_list[i], oid_to_hex(base_list[i])))) if (!(base = get_ref(opt->repo, base_list[i],
oid_to_hex(base_list[i]))))
return err(opt, _("Could not parse object '%s'"), return err(opt, _("Could not parse object '%s'"),
oid_to_hex(base_list[i])); oid_to_hex(base_list[i]));
commit_list_insert(base, &ca); commit_list_insert(base, &ca);