Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
b1eef912
Commit
b1eef912
authored
Oct 27, 2015
by
Edward Thomson
Committed by
Edward Thomson
Nov 25, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge: add recursive test with conflicting contents
parent
1b82f7b6
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
34 additions
and
0 deletions
+34
-0
tests/merge/trees/recursive.c
+23
-0
tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e
+0
-0
tests/resources/merge-recursive/.gitted/objects/38/55170cef875708da06ab9ad7fc6a73b531cda1
+0
-0
tests/resources/merge-recursive/.gitted/objects/5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0
+0
-0
tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b
+5
-0
tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7
+0
-0
tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb
+4
-0
tests/resources/merge-recursive/.gitted/refs/heads/branchF-1
+1
-0
tests/resources/merge-recursive/.gitted/refs/heads/branchF-2
+1
-0
No files found.
tests/merge/trees/recursive.c
View file @
b1eef912
...
...
@@ -246,3 +246,26 @@ void test_merge_trees_recursive__three_base_commits_norecursive(void)
git_index_free
(
index
);
}
void
test_merge_trees_recursive__conflict
(
void
)
{
git_index
*
index
;
git_merge_options
opts
=
GIT_MERGE_OPTIONS_INIT
;
struct
merge_index_entry
merge_index_entries
[]
=
{
{
0100644
,
"ffb36e513f5fdf8a6ba850a20142676a2ac4807d"
,
0
,
"asparagus.txt"
},
{
0100644
,
"68f6182f4c85d39e1309d97c7e456156dc9c0096"
,
0
,
"beef.txt"
},
{
0100644
,
"4b7c5650008b2e747fe1809eeb5a1dde0e80850a"
,
0
,
"bouilli.txt"
},
{
0100644
,
"c4e6cca3ec6ae0148ed231f97257df8c311e015f"
,
0
,
"gravy.txt"
},
{
0100644
,
"68af1fc7407fd9addf1701a87eb1c95c7494c598"
,
0
,
"oyster.txt"
},
{
0100644
,
"fa567f568ed72157c0c617438d077695b99d9aac"
,
1
,
"veal.txt"
},
{
0100644
,
"21950d5e4e4d1a871b4dfcf72ecb6b9c162c434e"
,
2
,
"veal.txt"
},
{
0100644
,
"3855170cef875708da06ab9ad7fc6a73b531cda1"
,
3
,
"veal.txt"
},
};
cl_git_pass
(
merge_commits_from_branches
(
&
index
,
repo
,
"branchF-1"
,
"branchF-2"
,
&
opts
));
cl_assert
(
merge_test_index
(
index
,
merge_index_entries
,
8
));
git_index_free
(
index
);
}
tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e
0 → 100644
View file @
b1eef912
File added
tests/resources/merge-recursive/.gitted/objects/38/55170cef875708da06ab9ad7fc6a73b531cda1
0 → 100644
View file @
b1eef912
File added
tests/resources/merge-recursive/.gitted/objects/5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0
0 → 100644
View file @
b1eef912
File added
tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b
0 → 100644
View file @
b1eef912
File added
tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7
0 → 100644
View file @
b1eef912
File added
tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb
0 → 100644
View file @
b1eef912
File added
tests/resources/merge-recursive/.gitted/refs/heads/branchF-1
0 → 100644
View file @
b1eef912
783d6539dde96b8873c5b5da3e79cc14cd64830b
tests/resources/merge-recursive/.gitted/refs/heads/branchF-2
0 → 100644
View file @
b1eef912
ef1783444b61a8671beea4ce1f4d0202677dfbfb
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment