MergeOp: Include full BatchRefUpdate in update failure exception

Change-Id: I0d9d5c95cff616cb5fbd170b683fb355c2858e7f
2015-01-29 10:37:52 -08:00
parent 2c707a6316
commit c5a971edbe
1 changed files with 3 additions and 2 deletions
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -722,9 +722,10 @@ public class MergeOp {
          } else {
            msg = "will not retry";
          }
-          throw new IOException(cmd.getResult().name() + ", " + msg);
+          throw new IOException(cmd.getResult().name() + ", " + msg
+              + '\n' + branchUpdate);
        default:
-          throw new IOException(cmd.getResult().name());
+          throw new IOException(cmd.getResult().name() + '\n' + branchUpdate);
      }
    } catch (IOException e) {
      throw new MergeException("Cannot update " + destBranch.get(), e);