Avoid NPE that can occur during finishing a Gitflow release
commit0717dc174a6ed1e5346a62c21e8291f8aae4f04e
authorMax Hohenegger <eclipse@hohenegger.eu>
Mon, 24 Oct 2016 19:41:46 +0000 (24 21:41 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 2 Nov 2016 23:03:18 +0000 (3 00:03 +0100)
tree620ca0e562e778318749a5bdd0c046783ab9afd7
parentaa2a8f70c5b7a63c30adbeb94a7664658b7eed56
Avoid NPE that can occur during finishing a Gitflow release

At the moment it is unclear how this NPE can be reproduced.
Presumably it happens due to a failed merge.
Fail early, and added logging to provide information about which of the
merges failed.

https://dev.eclipse.org/recommenders/committers/aeri/v2/#!/problems/5806eda2e4b0596435bd7852

Change-Id: I4e5f1c2faebc0c1cb3a05ede049eec7e64da05f3
Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java
org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/internal/CoreText.java
org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/internal/coretext.properties
org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/GitFlowOperation.java