]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e38cf20) | patch
Fix ClassCastException in MergeCommand 60/3860/5
authorDenys Digtiar <duemir@gmail.com>
Mon, 18 Jul 2011 05:33:30 +0000 (08:33 +0300)
committerChris Aniszczyk <zx@twitter.com>
Sun, 21 Aug 2011 20:53:02 +0000 (13:53 -0700)
commitc580c56c4def9639b603553b3d4cbc7117a30938
treed3801915c28f1baa1b3215e9eb691021d6c64614tree | snapshot
parente38cf2078d22e2c902a373371382ac8d82268f2dcommit | diff
Fix ClassCastException in MergeCommand

Test was added which reproduce the ClassCastException when ours or
theirs merge strategy is set to MergeCommand. Merger and MergeCommand
were updated in order to avoid exception.

Change-Id: I4c1284b4e80d82638d0677a05e5d38182526d196
Signed-off-by: Denys Digtiar <duemir@gmail.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
org.eclipse.jgit.test/META-INF/MANIFEST.MF diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit