tree d330e8fdd65c1d04d074ff3f86e97021fc796d3a
parent 6e042c17aa85ac5348bc5f6eb3236ca298b79309
author Stefan Beller <sbeller@google.com> 1429811904 -0700
committer Stefan Beller <sbeller@google.com> 1429811904 -0700

SubmoduleOp: Fix merging multiple changes to superprojects

Under certain conditions the SubmoduleOp did not behave correctly. Instead
of merging the changes from a submodule to a superproject, there was a
null pointer exception instead when parsing the commit messages of the
changes.

This is fixing the issue as well as having a regression test to prevent
such behavior in the future.

A new file in the acceptance test suite is introduced, because we need to
test with a non default configuration, and we don't want to change the
SubmoduleSubscriptionsIT.java to have the non default configuration on
top as that would run all the test twice with and without the new config.

Bug: issue 3197
Change-Id: I168cb2feeaba072987a9376352d289f6acccc08a