From 324fd5f3af2b97adc7fc64ee5cee6d2372836318 Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Thu, 21 Jan 2016 11:39:26 -0500
Subject: [PATCH] Update JGit to recent snapshot

Fix a resulting compile error due to exceptions changing.

Change-Id: I3119eb73e07b5ee489af907c3c6202b900ab5c09
---
 .../gerrit/server/change/ChangeInserter.java    | 17 ++++++-----------
 lib/jgit/BUCK                                   | 12 ++++++------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
index ef35045fa8..9626295231 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -168,17 +168,12 @@ public class ChangeInserter extends BatchUpdate.InsertChangeOp {
     if (!idList.isEmpty()) {
       return new Change.Key(idList.get(idList.size() - 1).trim());
     }
-
-    try {
-      ObjectId id = ChangeIdUtil.computeChangeId(commit.getTree(), commit,
-          commit.getAuthorIdent(), commit.getCommitterIdent(),
-          commit.getShortMessage());
-      StringBuilder changeId = new StringBuilder();
-      changeId.append("I").append(ObjectId.toString(id));
-      return new Change.Key(changeId.toString());
-    } catch (IOException e) {
-      throw new IllegalStateException(e);
-    }
+    ObjectId id = ChangeIdUtil.computeChangeId(commit.getTree(), commit,
+        commit.getAuthorIdent(), commit.getCommitterIdent(),
+        commit.getShortMessage());
+    StringBuilder changeId = new StringBuilder();
+    changeId.append("I").append(ObjectId.toString(id));
+    return new Change.Key(changeId.toString());
   }
 
   public PatchSet.Id getPatchSetId() {
diff --git a/lib/jgit/BUCK b/lib/jgit/BUCK
index 0da99c20b8..a77da7c1eb 100644
--- a/lib/jgit/BUCK
+++ b/lib/jgit/BUCK
@@ -1,13 +1,13 @@
 include_defs('//lib/maven.defs')
 
 REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL.
-VERS = '4.2.0.201511101648-m1.136-g91a3f17'
+VERS = '4.2.0.201511101648-m1.201-g7b61229'
 
 maven_jar(
   name = 'jgit',
   id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
-  bin_sha1 = '6820c375589d520600210a5e6fa9c427c98da9f9',
-  src_sha1 = '84566ffe5dd8a099ef55eca29d073e64a290f464',
+  bin_sha1 = '2ee3b2c4b766b49ef14dfe03a5b2256a7b9d1023',
+  src_sha1 = '4042ba30571234e484f0d2e5b305b70601cebdee',
   license = 'jgit',
   repository = REPO,
   unsign = True,
@@ -22,7 +22,7 @@ maven_jar(
 maven_jar(
   name = 'jgit-servlet',
   id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
-  sha1 = 'e156f06051cf431e72239e84cb85f554d90a7ef0',
+  sha1 = '4e213feb3f2f754b9956cd8ceadf307a146a765c',
   license = 'jgit',
   repository = REPO,
   deps = [':jgit'],
@@ -36,7 +36,7 @@ maven_jar(
 maven_jar(
   name = 'jgit-archive',
   id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
-  sha1 = '7bbb559e7f90fa7aeb4ff6867c428d1456861e50',
+  sha1 = '5c40a2656fd883ec0ecbc19d937dff8da0ac85e1',
   license = 'jgit',
   repository = REPO,
   deps = [':jgit',
@@ -53,7 +53,7 @@ maven_jar(
 maven_jar(
   name = 'junit',
   id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
-  sha1 = 'a88ce61fd778ea8b17ae2235ae594ddc59f9bf39',
+  sha1 = '0a51b18ccdc2690b68fa0eb91d23fef0f26b9e57',
   license = 'DO_NOT_DISTRIBUTE',
   repository = REPO,
   unsign = True,