From 074cf2383281899395ec573a903e9649d53428b3 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Thu, 19 Jan 2017 11:22:39 +0900
Subject: [PATCH] Upgrade JGit to 4.6.0.201612231935-r.30-gd3148f300

This snapshot includes several fixes since the release, including some
improvements in LFS support:

  d3148f300 Make ObjectDownloadListener public
  55c629a9f LfsProtocolServlet#LfsRequest: Add operation type helper methods
  56fe21778 Expose LFS operation strings as public constants
  590141163 LfsProtocolServlet: Improve error on getLargeFileRepository failure
  7245aa031 Add support for refusing LFS request due to invalid authorization
  0e187f148 Add LfsPointerFilter TreeFilter

Change-Id: Ib3cd9d8677b6c6017becc5c46e7fa4dfc5192807
---
 WORKSPACE                                  | 14 +++++++++-----
 lib/JGIT_VERSION                           |  2 +-
 lib/jgit/jgit.bzl                          |  4 ++--
 lib/jgit/org.eclipse.jgit.archive/BUCK     |  2 +-
 lib/jgit/org.eclipse.jgit.http.server/BUCK |  2 +-
 lib/jgit/org.eclipse.jgit.junit/BUCK       |  2 +-
 lib/jgit/org.eclipse.jgit/BUCK             |  4 ++--
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 15cbab9c33..26b6ac694d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -134,15 +134,17 @@ load("//lib/jgit:jgit.bzl", "JGIT_VERS")
 maven_jar(
     name = "jgit",
     artifact = "org.eclipse.jgit:org.eclipse.jgit:" + JGIT_VERS,
-    sha1 = "b705df6cb4c0f4413e6ad52c6cd12011cc6fba4c",
-    src_sha1 = "6ec89bdedccdab092f395016ab761dcdb08f7ffc",
+    repository = GERRIT,
+    sha1 = "a2b5970b853f8fee64589fc1103c0ceb7677ba63",
+    src_sha1 = "765f955774c36c226aa41fba7c20119451de2db7",
     unsign = True,
 )
 
 maven_jar(
     name = "jgit_servlet",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + JGIT_VERS,
-    sha1 = "5cb46863efcb208a3a9f729c0b6fd00be0dae6ee",
+    repository = GERRIT,
+    sha1 = "d3aa54bd610db9a5c246aa8fef13989982c98628",
     unsign = True,
 )
 
@@ -156,13 +158,15 @@ maven_jar(
 maven_jar(
     name = "jgit_archive",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + JGIT_VERS,
-    sha1 = "d44816c7b47746948485430e7372b15108b4bf2e",
+    repository = GERRIT,
+    sha1 = "a728cf277396f1227c5a8dffcf5dee0188fc0821",
 )
 
 maven_jar(
     name = "jgit_junit",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + JGIT_VERS,
-    sha1 = "42bd9796a68b0de8abf1e0c23ebd4006bf9645e0",
+    repository = GERRIT,
+    sha1 = "6c2b2f192c95d25a2e1576aee5d1169dd8bd2266",
     unsign = True,
 )
 
diff --git a/lib/JGIT_VERSION b/lib/JGIT_VERSION
index 569cf59666..87a625fedd 100644
--- a/lib/JGIT_VERSION
+++ b/lib/JGIT_VERSION
@@ -1,4 +1,4 @@
 include_defs('//lib/jgit/jgit.bzl')
 include_defs('//lib/maven.defs')
 
-REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.
+REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL.
diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl
index 2982588d3b..99f0432a5f 100644
--- a/lib/jgit/jgit.bzl
+++ b/lib/jgit/jgit.bzl
@@ -1,5 +1,5 @@
-JGIT_VERS = "4.6.0.201612231935-r"
+JGIT_VERS = "4.6.0.201612231935-r.30-gd3148f300"
 
-DOC_VERS = JGIT_VERS # Set to JGIT_VERS unless using a snapshot
+DOC_VERS = "4.6.0.201612231935-r" # Set to JGIT_VERS unless using a snapshot
 
 JGIT_DOC_URL = "http://download.eclipse.org/jgit/site/" + DOC_VERS + "/apidocs"
diff --git a/lib/jgit/org.eclipse.jgit.archive/BUCK b/lib/jgit/org.eclipse.jgit.archive/BUCK
index b73987f8ab..f96bf4c030 100644
--- a/lib/jgit/org.eclipse.jgit.archive/BUCK
+++ b/lib/jgit/org.eclipse.jgit.archive/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit-archive',
   id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + JGIT_VERS,
-  sha1 = 'd44816c7b47746948485430e7372b15108b4bf2e',
+  sha1 = 'a728cf277396f1227c5a8dffcf5dee0188fc0821',
   license = 'jgit',
   repository = REPO,
   deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUCK b/lib/jgit/org.eclipse.jgit.http.server/BUCK
index ab71e7d0ff..c31de7057b 100644
--- a/lib/jgit/org.eclipse.jgit.http.server/BUCK
+++ b/lib/jgit/org.eclipse.jgit.http.server/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit-servlet',
   id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + JGIT_VERS,
-  sha1 = '5cb46863efcb208a3a9f729c0b6fd00be0dae6ee',
+  sha1 = 'd3aa54bd610db9a5c246aa8fef13989982c98628',
   license = 'jgit',
   repository = REPO,
   deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
diff --git a/lib/jgit/org.eclipse.jgit.junit/BUCK b/lib/jgit/org.eclipse.jgit.junit/BUCK
index d3808b74e5..6073fa0382 100644
--- a/lib/jgit/org.eclipse.jgit.junit/BUCK
+++ b/lib/jgit/org.eclipse.jgit.junit/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'junit',
   id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + JGIT_VERS,
-  sha1 = '42bd9796a68b0de8abf1e0c23ebd4006bf9645e0',
+  sha1 = '6c2b2f192c95d25a2e1576aee5d1169dd8bd2266',
   license = 'DO_NOT_DISTRIBUTE',
   repository = REPO,
   unsign = True,
diff --git a/lib/jgit/org.eclipse.jgit/BUCK b/lib/jgit/org.eclipse.jgit/BUCK
index 97d2edf6b4..a1e14a5890 100644
--- a/lib/jgit/org.eclipse.jgit/BUCK
+++ b/lib/jgit/org.eclipse.jgit/BUCK
@@ -4,8 +4,8 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit',
   id = 'org.eclipse.jgit:org.eclipse.jgit:' + JGIT_VERS,
-  bin_sha1 = 'b705df6cb4c0f4413e6ad52c6cd12011cc6fba4c',
-  src_sha1 = '6ec89bdedccdab092f395016ab761dcdb08f7ffc',
+  bin_sha1 = 'a2b5970b853f8fee64589fc1103c0ceb7677ba63',
+  src_sha1 = '765f955774c36c226aa41fba7c20119451de2db7',
   license = 'jgit',
   repository = REPO,
   unsign = True,