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

Fix rebase bug and include test for merge=union

Browse Source
This commit is contained in:
Stan Hu 2015-12-03 09:57:56 -08:00 committed by Edward Thomson
parent f8787098fb
commit 7a74590d8f
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/merge.c
View File

@ -1900,7 +1900,7 @@ int git_merge__iterators(
int resolved = 0; int resolved = 0;
/* Check for merge options in .gitattributes */ /* Check for merge options in .gitattributes */
if ((error = lookup_file_favor(&opts.file_favor, repo, conflict->our_entry.path) < 0)) if ((error = lookup_file_favor(&file_opts.favor, repo, conflict->our_entry.path) < 0))
goto done; goto done;
if ((error = merge_conflict_resolve( if ((error = merge_conflict_resolve(

36
tests/merge/workdir/simple.c
View File

@ -330,6 +330,42 @@ void test_merge_workdir_simple__union(void)
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4));
} }
void test_merge_workdir_simple__gitattributes_union(void)
{
git_buf conflicting_buf = GIT_BUF_INIT;
struct merge_index_entry merge_index_entries[] = {
ADDED_IN_MASTER_INDEX_ENTRY,
AUTOMERGEABLE_INDEX_ENTRY,
CHANGED_IN_BRANCH_INDEX_ENTRY,
CHANGED_IN_MASTER_INDEX_ENTRY,
{ 0100644, "72cdb057b340205164478565e91eb71647e66891", 0, "conflicting.txt" },
UNCHANGED_INDEX_ENTRY,
};
struct merge_reuc_entry merge_reuc_entries[] = {
AUTOMERGEABLE_REUC_ENTRY,
CONFLICTING_REUC_ENTRY,
REMOVED_IN_BRANCH_REUC_ENTRY,
REMOVED_IN_MASTER_REUC_ENTRY
};
set_core_autocrlf_to(repo, false);
cl_git_mkfile(TEST_REPO_PATH "/.gitattributes", "conflicting.txt merge=union\n");
merge_simple_branch(GIT_MERGE_FILE_FAVOR_NORMAL, 0);
cl_git_pass(git_futils_readbuffer(&conflicting_buf,
TEST_REPO_PATH "/conflicting.txt"));
cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_UNION_FILE) == 0);
git_buf_free(&conflicting_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 6));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4));
}
void test_merge_workdir_simple__diff3_from_config(void) void test_merge_workdir_simple__diff3_from_config(void)
{ {
git_config *config; git_config *config;