diff options
| author | Demetr Starshov <dstarshov@google.com> | 2020-08-12 15:01:10 -0700 |
|---|---|---|
| committer | Demetr Starshov <dstarshov@google.com> | 2020-08-26 18:40:28 -0700 |
| commit | 214c4afc2c9a7306ac989df218b7cab30ee5e026 (patch) | |
| tree | f4930d7a66be1908ce64f166963a774e67cb270e /org.eclipse.jgit.test | |
| parent | 2ae84c320a34ce3e29eaae72292ff7f1b5d723ba (diff) | |
| download | jgit-214c4afc2c9a7306ac989df218b7cab30ee5e026.tar.gz jgit-214c4afc2c9a7306ac989df218b7cab30ee5e026.zip | |
ResolveMerger: do not content-merge gitlinks on del/mod conflicts
Previously ResolveMerger tried to make a fulltext merge entry in case
one of sides got deleted regardless of file mode. This is not
applicable for GITLINK type of entry. After this change it is
rendering appropriate merge result.
Signed-off-by: Demetr Starshov <dstarshov@google.com>
Change-Id: Ibdb4557bf8781bdb48bcee6529e37dc80582ed7e
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java index 7ca1e8ce3f..c850b4d749 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java @@ -27,7 +27,6 @@ import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; import org.eclipse.jgit.treewalk.TreeWalk; -import org.junit.Ignore; import org.junit.Test; public class GitlinkMergeTest extends SampleDataRepositoryTestCase { @@ -38,7 +37,6 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { private static final String SUBMODULE_PATH = "submodule.link"; @Test - @Ignore("Broken") public void testGitLinkMerging_AddNew() throws Exception { assertGitLinkValue( testGitLink(null, null, LINK_ID3, newResolveMerger(), true), @@ -46,20 +44,17 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { } @Test - @Ignore("Broken") public void testGitLinkMerging_Delete() throws Exception { assertGitLinkDoesntExist(testGitLink(LINK_ID1, LINK_ID1, null, newResolveMerger(), true)); } @Test - @Ignore("Broken") public void testGitLinkMerging_UpdateDelete() throws Exception { testGitLink(LINK_ID1, LINK_ID2, null, newResolveMerger(), false); } @Test - @Ignore("Broken") public void testGitLinkMerging_DeleteUpdate() throws Exception { testGitLink(LINK_ID1, null, LINK_ID3, newResolveMerger(), false); } @@ -90,14 +85,12 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { } @Test - @Ignore("Broken") public void testGitLinkMerging_Delete_ignoreConflicts() throws Exception { assertGitLinkDoesntExist(testGitLink(LINK_ID1, LINK_ID1, null, newIgnoreConflictMerger(), true)); } @Test - @Ignore("Broken") public void testGitLinkMerging_UpdateDelete_ignoreConflicts() throws Exception { assertGitLinkValue(testGitLink(LINK_ID1, LINK_ID2, null, @@ -105,7 +98,6 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { } @Test - @Ignore("Broken") public void testGitLinkMerging_DeleteUpdate_ignoreConflicts() throws Exception { assertGitLinkDoesntExist(testGitLink(LINK_ID1, null, LINK_ID3, @@ -299,7 +291,6 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { } @Test - @Ignore("Broken") public void testGitLinkMerging_linkBlobDeleted() throws Exception { // We changed a link to a blob, others has deleted this link. DirCache treeB = db.readDirCache(); |