From c96c5383ff05e58be83116f1b97bd438bffc7450 Mon Sep 17 00:00:00 2001
From: "David A. Greene" <greened@obbligato.org>
Date: Mon, 9 Apr 2012 22:11:25 -0500
Subject: [PATCH] Remove unnecessary git-subtree files

Remove various files that simply duplicate functionality already
provided by the main project files.

Signed-off-by: David A. Greene <greened@obbligato.org>
---
 contrib/subtree/asciidoc.conf      | 91 ------------------------------
 contrib/subtree/git-subtree        |  1 -
 contrib/subtree/install.sh         |  2 -
 contrib/subtree/manpage-base.xsl   | 35 ------------
 contrib/subtree/manpage-normal.xsl | 13 -----
 contrib/subtree/shellopts.sh       |  1 -
 6 files changed, 143 deletions(-)
 delete mode 100644 contrib/subtree/asciidoc.conf
 delete mode 120000 contrib/subtree/git-subtree
 delete mode 100644 contrib/subtree/install.sh
 delete mode 100644 contrib/subtree/manpage-base.xsl
 delete mode 100644 contrib/subtree/manpage-normal.xsl
 delete mode 100644 contrib/subtree/shellopts.sh

diff --git a/contrib/subtree/asciidoc.conf b/contrib/subtree/asciidoc.conf
deleted file mode 100644
index dc76e7f07..000000000
--- a/contrib/subtree/asciidoc.conf
+++ /dev/null
@@ -1,91 +0,0 @@
-## linkgit: macro
-#
-# Usage: linkgit:command[manpage-section]
-#
-# Note, {0} is the manpage section, while {target} is the command.
-#
-# Show GIT link as: <command>(<section>); if section is defined, else just show
-# the command.
-
-[macros]
-(?su)[\\]?(?P<name>linkgit):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
-
-[attributes]
-asterisk=&#42;
-plus=&#43;
-caret=&#94;
-startsb=&#91;
-endsb=&#93;
-tilde=&#126;
-
-ifdef::backend-docbook[]
-[linkgit-inlinemacro]
-{0%{target}}
-{0#<citerefentry>}
-{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
-{0#</citerefentry>}
-endif::backend-docbook[]
-
-ifdef::backend-docbook[]
-ifndef::git-asciidoc-no-roff[]
-# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
-# v1.72 breaks with this because it replaces dots not in roff requests.
-[listingblock]
-<example><title>{title}</title>
-<literallayout>
-ifdef::doctype-manpage[]
-&#10;.ft C&#10;
-endif::doctype-manpage[]
-|
-ifdef::doctype-manpage[]
-&#10;.ft&#10;
-endif::doctype-manpage[]
-</literallayout>
-{title#}</example>
-endif::git-asciidoc-no-roff[]
-
-ifdef::git-asciidoc-no-roff[]
-ifdef::doctype-manpage[]
-# The following two small workarounds insert a simple paragraph after screen
-[listingblock]
-<example><title>{title}</title>
-<literallayout>
-|
-</literallayout><simpara></simpara>
-{title#}</example>
-
-[verseblock]
-<formalpara{id? id="{id}"}><title>{title}</title><para>
-{title%}<literallayout{id? id="{id}"}>
-{title#}<literallayout>
-|
-</literallayout>
-{title#}</para></formalpara>
-{title%}<simpara></simpara>
-endif::doctype-manpage[]
-endif::git-asciidoc-no-roff[]
-endif::backend-docbook[]
-
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[header]
-template::[header-declarations]
-<refentry>
-<refmeta>
-<refentrytitle>{mantitle}</refentrytitle>
-<manvolnum>{manvolnum}</manvolnum>
-<refmiscinfo class="source">Git</refmiscinfo>
-<refmiscinfo class="version">{git_version}</refmiscinfo>
-<refmiscinfo class="manual">Git Manual</refmiscinfo>
-</refmeta>
-<refnamediv>
-  <refname>{manname}</refname>
-  <refpurpose>{manpurpose}</refpurpose>
-</refnamediv>
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-ifdef::backend-xhtml11[]
-[linkgit-inlinemacro]
-<a href="{target}.html">{target}{0?({0})}</a>
-endif::backend-xhtml11[]
diff --git a/contrib/subtree/git-subtree b/contrib/subtree/git-subtree
deleted file mode 120000
index 7d7539894..000000000
--- a/contrib/subtree/git-subtree
+++ /dev/null
@@ -1 +0,0 @@
-git-subtree.sh
\ No newline at end of file
diff --git a/contrib/subtree/install.sh b/contrib/subtree/install.sh
deleted file mode 100644
index 1f87a6243..000000000
--- a/contrib/subtree/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# copy Git to where the rest of the Git scripts are found.
-cp git-subtree.sh "$(git --exec-path)"/git-subtree
\ No newline at end of file
diff --git a/contrib/subtree/manpage-base.xsl b/contrib/subtree/manpage-base.xsl
deleted file mode 100644
index a264fa616..000000000
--- a/contrib/subtree/manpage-base.xsl
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- manpage-base.xsl:
-     special formatting for manpages rendered from asciidoc+docbook -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="1.0">
-
-<!-- these params silence some output from xmlto -->
-<xsl:param name="man.output.quietly" select="1"/>
-<xsl:param name="refentry.meta.get.quietly" select="1"/>
-
-<!-- convert asciidoc callouts to man page format;
-     git.docbook.backslash and git.docbook.dot params
-     must be supplied by another XSL file or other means -->
-<xsl:template match="co">
-	<xsl:value-of select="concat(
-			      $git.docbook.backslash,'fB(',
-			      substring-after(@id,'-'),')',
-			      $git.docbook.backslash,'fR')"/>
-</xsl:template>
-<xsl:template match="calloutlist">
-	<xsl:value-of select="$git.docbook.dot"/>
-	<xsl:text>sp&#10;</xsl:text>
-	<xsl:apply-templates/>
-	<xsl:text>&#10;</xsl:text>
-</xsl:template>
-<xsl:template match="callout">
-	<xsl:value-of select="concat(
-			      $git.docbook.backslash,'fB',
-			      substring-after(@arearefs,'-'),
-			      '. ',$git.docbook.backslash,'fR')"/>
-	<xsl:apply-templates/>
-	<xsl:value-of select="$git.docbook.dot"/>
-	<xsl:text>br&#10;</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/contrib/subtree/manpage-normal.xsl b/contrib/subtree/manpage-normal.xsl
deleted file mode 100644
index a48f5b11f..000000000
--- a/contrib/subtree/manpage-normal.xsl
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- manpage-normal.xsl:
-     special settings for manpages rendered from asciidoc+docbook
-     handles anything we want to keep away from docbook-xsl 1.72.0 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="1.0">
-
-<xsl:import href="manpage-base.xsl"/>
-
-<!-- these are the normal values for the roff control characters -->
-<xsl:param name="git.docbook.backslash">\</xsl:param>
-<xsl:param name="git.docbook.dot"	>.</xsl:param>
-
-</xsl:stylesheet>
diff --git a/contrib/subtree/shellopts.sh b/contrib/subtree/shellopts.sh
deleted file mode 100644
index 42644cd01..000000000
--- a/contrib/subtree/shellopts.sh
+++ /dev/null
@@ -1 +0,0 @@
-export PATH=$PWD:$PATH
-- 
2.30.2