diff options
| author | Tommi Siivola <tommi.siivola@eficode.com> | 2012-09-12 08:19:30 +0300 |
|---|---|---|
| committer | Tommi Siivola <tommi.siivola@eficode.com> | 2012-09-12 13:11:57 +0300 |
| commit | 0e56f347528fb333a344aaec126ea391ff18e43b (patch) | |
| tree | 4649f358fc1f070fc2c8dd5657a14336d13c4141 /org.eclipse.jgit/findBugs | |
| parent | e5cd1d4add6f3bcaad2fb5f0158a697658d308cb (diff) | |
| download | jgit-0e56f347528fb333a344aaec126ea391ff18e43b.tar.gz jgit-0e56f347528fb333a344aaec126ea391ff18e43b.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit/findBugs')
0 files changed, 0 insertions, 0 deletions