From 1fd8ba76f601191c19c933b0433eea5e13c20b95 Mon Sep 17 00:00:00 2001
From: Youssef Elghareeb <ghareeb@google.com>
Date: Thu, 14 Jan 2021 12:55:32 +0100
Subject: [PATCH] Propagate the exception cause in CherryPickChange#cherryPick

So that it facilitates understanding the root cause of the exception
while debugging the logs.

Change-Id: I0f90f93d033444f2898d6fa4d2d71518c0820cc5
---
 .../google/gerrit/server/restapi/change/CherryPickChange.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
index 5753874a6d..a3e0cf0e56 100644
--- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
+++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
@@ -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)) {