git - copy contrib folder to share

1 files changed, 14 insertions, 7 deletions

diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb
index f972c377a..c23ce7b6c 100644
--- a/Library/Formula/git.rb
+++ b/Library/Formula/git.rb
@@ -30,16 +30,15 @@ class Git < Formula
 
     system "make", "prefix=#{prefix}", "install"
 
-    # Install the git bash completion file.  Put it into the Cellar so
-    # that it gets upgraded along with git upgrades.  (Normally, etc
-    # files go directly into HOMEBREW_PREFIX so that they don't get
-    # clobbered on upgrade.)
-
+    # Install the git bash completion file.
+    # Put it into the Cellar so that it gets upgraded along with git upgrades.
     (prefix+'etc/bash_completion.d').install 'contrib/completion/git-completion.bash'
+
+    # Install emacs support.
     (share+'doc/git-core/contrib').install 'contrib/emacs'
 
-    # Install git-p4
-    bin.install 'contrib/fast-import/git-p4'
+    # Install all other contrib files to share/contrib
+    (share).install 'contrib'
 
     # these files are exact copies of the git binary, so like the contents
     # of libexec/git-core lets hard link them
@@ -57,4 +56,12 @@ class Git < Formula
     GitManuals.new.brew { man.install Dir['*'] }
     GitHtmldocs.new.brew { (share+'doc/git-doc').install Dir['*'] }
   end
+
+  def caveats; <<-EOS.undent
+    Bash completion and emacs support have been installed.
+
+    The rest of the "contrib" folder has been copied to:
+      #{share}/contrib
+    EOS
+  end
 end