opendev/gerrit
Code Issues Proposed changes

Merge "Propagate the exception cause in CherryPickChange#cherryPick"

Browse Source
This commit is contained in:
Edwin Kempin
2021-01-14 13:16:51 +00:00
committed by Gerrit Code Review
parent 4361c9317b 1fd8ba76f6
commit 4b42f80e96
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/restapi/change/CherryPickChange.java
View File

@@ -334,7 +334,7 @@ public class CherryPickChange {
input.allowEmpty,
input.allowConflicts);
} catch (MergeIdenticalTreeException | MergeConflictException e) {
throw new IntegrationConflictException("Cherry pick failed: " + e.getMessage());
throw new IntegrationConflictException("Cherry pick failed: " + e.getMessage(), e);
}
try (BatchUpdate bu = batchUpdateFactory.create(project, identifiedUser, timestamp)) {