git 2.2.0

Closes #34491.
Closes #34483.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

1 files changed, 6 insertions, 29 deletions

diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb
index 6b312651d..4fec75fbf 100644
--- a/Library/Formula/git.rb
+++ b/Library/Formula/git.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class Git < Formula
   homepage "http://git-scm.com"
-  url "https://www.kernel.org/pub/software/scm/git/git-2.1.3.tar.gz"
-  sha1 "e8e7dcff1c23dc56f5d00460283f8ab779998f48"
+  url "https://www.kernel.org/pub/software/scm/git/git-2.2.0.tar.gz"
+  sha1 "b59ad3f9e9c933960b064e31d793757c145be83a"
 
   head "https://github.com/git/git.git", :shallow => false
 
@@ -14,13 +14,13 @@ class Git < Formula
   end
 
   resource "man" do
-    url "https://www.kernel.org/pub/software/scm/git/git-manpages-2.1.3.tar.gz"
-    sha1 "68b07135b73ca05dab08eb909dfcecd0216230d2"
+    url "https://www.kernel.org/pub/software/scm/git/git-manpages-2.2.0.tar.gz"
+    sha1 "6d068b6526ef035f48505894de7452df22e6ed40"
   end
 
   resource "html" do
-    url "https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.1.3.tar.gz"
-    sha1 "5177f471c677ffb570e8618b7dce79e1024a628e"
+    url "https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.2.0.tar.gz"
+    sha1 "fef0a1944d9d94d5a97e2dae3e53b9818af7973d"
   end
 
   option 'with-blk-sha1', 'Compile with the block-optimized SHA1 implementation'
@@ -37,10 +37,6 @@ class Git < Formula
   depends_on 'go' => :build if build.with? 'persistent-https'
   depends_on 'subversion' => 'perl' if build.with? 'brewed-svn'
 
-  # This patch fixes Makefile bug contrib/subtree
-  # http://thread.gmane.org/gmane.comp.version-control.git/255347
-  patch :DATA
-
   def install
     # If these things are installed, tell Git build system to not use them
     ENV['NO_FINK'] = '1'
@@ -148,22 +144,3 @@ class Git < Formula
     end
   end
 end
-
-__END__
---- a/contrib/subtree/Makefile
-+++ b/contrib/subtree/Makefile
-@@ -1,3 +1,5 @@
-+all::
-+
- -include ../../config.mak.autogen
- -include ../../config.mak
- 
-@@ -34,7 +36,7 @@ GIT_SUBTREE_XML := git-subtree.xml
- GIT_SUBTREE_TXT := git-subtree.txt
- GIT_SUBTREE_HTML := git-subtree.html
- 
--all: $(GIT_SUBTREE)
-+all:: $(GIT_SUBTREE)
- 
- $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
- 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' $< >$@