]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e5cd1d4) | patch
Fix ResolveMerger issue with submodule conflict 23/7723/2
authorTommi Siivola <tommi.siivola@eficode.com>
Wed, 12 Sep 2012 05:19:30 +0000 (08:19 +0300)
committerTommi Siivola <tommi.siivola@eficode.com>
Wed, 12 Sep 2012 10:11:57 +0000 (13:11 +0300)
commit0e56f347528fb333a344aaec126ea391ff18e43b
tree4649f358fc1f070fc2c8dd5657a14336d13c4141tree | snapshot
parente5cd1d4add6f3bcaad2fb5f0158a697658d308cbcommit | diff
Fix ResolveMerger issue with submodule conflict

ResolveMerger throws a MissingObjectException when it encounters
a submodule conflict while merging. The reason is that it treats
the submodule link as a blob and tries to read its contents.

We solve the issue by detecting before content merge whether the
path to be merged is a submodule link, and skip the content
merge if it is.

Bug: 389238
Change-Id: I9a58dfc7716b28a21f5c04cf3a865091ae8dfe7e
Signed-off-by: Tommi Siivola <tommi.siivola@eficode.com>
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit