8000 tests: merge: tree: detect incorrect renames. · libgit2/libgit2@a4d334d · GitHub
[go: up one dir, main page]
Skip to content

Commit a4d334d

Browse files
herrerogherrerog
committed
tests: merge: tree: detect incorrect renames.
This test follow "merge: fix incorrect rename detection for empty files." commit. Signed-off-by: Gregory Herrero <gregory.herrero@oracle.com>
1 parent d329698 commit a4d334d

12 files changed

+28
-0
lines changed

‎tests/libgit2/merge/trees/trivial.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,22 @@ void test_merge_trees_trivial__11(void)
308308

309309
git_index_free(result);
310310
}
311+
312+
/* 15: ancest:remote^, head:head, remote:remote = result:no merge */
313+
void test_merge_trees_trivial__15(void)
314+
{
315+
git_index *result;
316+
const git_index_entry *entry;
317+
318+
/* Can't use merge_trivialfalsehere because a different ancestor is used. */
319+
cl_git_pass(merge_trivial(&result, "trivial-15", "trivial-15-branch", true));
320+
321+
cl_assert((entry = git_index_get_bypath(result, "another-new-empty-15.txt", GIT_INDEX_STAGE_NORMAL)) == NULL);
322+
cl_assert((entry = git_index_get_bypath(result, "another-new-empty-15.txt", GIT_INDEX_STAGE_ANCESTOR)));
323+
cl_assert((entry = git_index_get_bypath(result, "another-new-empty-15.txt", GIT_INDEX_STAGE_OURS)) == NULL);
324+
cl_assert((entry = git_index_get_bypath(result, "another-new-empty-15.txt", GIT_INDEX_STAGE_THEIRS)));
325+
cl_assert(merge_trivial_conflict_entrycount(result) == 2);
326+
327+
git_index_free(result);
328+
}
329+

‎tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-15

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0000000000000000000000000000000000000000 c452c5eb5aacf204fc95a55d1eb9668736fecfb6 Gregory Herrero <gregory.herrero@oracle.com> 1705326305 +0100 push

‎tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-15-branch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
0000000000000000000000000000000000000000 6706996f054c6af4fec7c77939d00e2f486dab4c Gregory Herrero <gregory.herrero@oracle.com> 1705326302 +0100 push
2+
6706996f054c6af4fec7c77939d00e2f486dab4c c5be2acabac675af81df8bb70400235af2a9c225 Gregory Herrero <gregory.herrero@oracle.com> 1705326412 +0100 push

‎tests/resources/merge-resolve/.gitted/objects/1d/6a96dd04ac7354ae6bb4ba24c514500fd0ec89

279 Bytes
Binary file not shown.

‎tests/resources/merge-resolve/.gitted/objects/48/320305de02310b9c4fd744243b9b0d1d5f11af

46 Bytes
Binary file not shown.

‎tests/resources/merge-resolve/.gitted/objects/67/06996f054c6af4fec7c77939d00e2f486dab4c

172 Bytes
Binary file not shown.

‎tests/resources/merge-resolve/.gitted/objects/c0/d1f321977d1c18e23a28c581fed6d17d0cc013

273 Bytes
Binary file not shown.

‎tests/resources/merge-resolve/.gitted/objects/c4/52c5eb5aacf204fc95a55d1eb9668736fecfb6

163 Bytes
Binary file not shown.

‎tests/resources/merge-resolve/.gitted/objects/c5/be2acabac675af81df8bb70400235af2a9c225

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
x��Aj1 @Ѭ}
2+
�CyF�c(%���,g2qn��o G��->_��o��1���P�3�
3+
Ȓ���T
4+
�Qb��*���{��}xJ@9S��Bܰ�$I)/����L� �㟱v�_��n�[�Ժ���`Z_p��r�I���C��̄@��=�y;�ݎ��n|;�x*�wY'��IS

‎tests/resources/merge-resolve/.gitted/objects/cd/d1cd02dbd164e9d18a644515bc2ca6551f13b4

280 Bytes
Binary file not shown.

‎tests/resources/merge-resolve/.gitted/refs/heads/trivial-15

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c452c5eb5aacf204fc95a55d1eb9668736fecfb6

‎tests/resources/merge-resolve/.gitted/refs/heads/trivial-15-branch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c5be2acabac675af81df8bb70400235af2a9c225

0 commit comments

Comments
 (0)
0