proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 15:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support union merges via .gitattributes file

Browse Source
This commit is contained in:
Stan Hu 2015-10-31 18:50:13 +01:00 committed by Edward Thomson
parent ba3493228c
commit f8787098fb
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/merge.c
View File

@ -1819,6 +1819,28 @@ static git_iterator *iterator_given_or_empty(git_iterator **empty, git_iterator
return *empty;
}
static int lookup_file_favor(
git_merge_file_favor_t *file_favor,
git_repository *repo,
const char *path)
{
int error = 0;
const char *value = NULL;
if (path) {
if ((error = git_attr_get(&value, repo, 0, path, "merge")) < 0)
goto done;
if (*file_favor == GIT_MERGE_FILE_FAVOR_NORMAL &&
value && strcmp(value, "union") == 0) {
*file_favor |= GIT_MERGE_FILE_FAVOR_UNION;
}
}
done:
return error;
}
int git_merge__iterators(
git_index **out,
git_repository *repo,
@ -1877,6 +1899,10 @@ int git_merge__iterators(
git_vector_foreach(&changes, i, conflict) {
int resolved = 0;
/* Check for merge options in .gitattributes */
if ((error = lookup_file_favor(&opts.file_favor, repo, conflict->our_entry.path) < 0))
goto done;
if ((error = merge_conflict_resolve(
&resolved, diff_list, conflict, &file_opts)) < 0)
goto done;