[PATCH 1/2] Makefile: add quick-install-doc for installing pre-built manpages

[PATCH 1/2] Makefile: add quick-install-doc for installing pre-built manpages

[Eric Wong]

This adds and uses the install-doc-quick.sh file to
Documentation/, which is usable for people who track either the
'html' or 'man' heads in Junio's repository.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 Documentation/Makefile             |    3 +++
 Documentation/install-doc-quick.sh |   32 ++++++++++++++++++++++++++++++++
 Makefile                           |    2 ++
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index d68bc4a..d563142 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -112,3 +112,6 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
 
 install-webdoc : html
 	sh ./install-webdoc.sh $(WEBDOC_DEST)
+
+quick-install:
+	DESTDIR=$(mandir) sh ./install-doc-quick.sh man
diff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh
new file mode 100644
index 0000000..44ccf60
--- /dev/null
+++ b/Documentation/install-doc-quick.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+# This requires a branch named in $head
+# (usually 'man' or 'html', provided by the git.git repository)
+set -e
+head="$1"
+if ! git-rev-parse --verify "$head" >/dev/null; then
+	echo >&2 "head: $head does not exist in the current repository"
+	exit 1
+fi
+
+if test -z "$DESTDIR"; then
+	echo >&2 'DESTDIR must be set in the environment'
+	exit 1
+fi
+
+GIT_INDEX_FILE=`pwd`/.quick-doc.index
+export GIT_INDEX_FILE
+rm -f "$GIT_INDEX_FILE"
+SUBDIRECTORY_OK=t
+. git-sh-setup
+export GIT_DIR
+git-read-tree $head
+git-checkout-index -a -f --prefix="$DESTDIR"/
+
+if test -n "$GZ"; then
+	cd "$DESTDIR"
+	for i in `git-ls-tree -r --name-only $head`
+	do
+		gzip < $i > $i.gz && rm $i
+	done
+fi
+rm -f "$GIT_INDEX_FILE"
diff --git a/Makefile b/Makefile
index 7651104..5492836 100644
--- a/Makefile
+++ b/Makefile
@@ -830,6 +830,8 @@ install: all
 install-doc:
 	$(MAKE) -C Documentation install
 
+quick-install-doc:
+	$(MAKE) -C Documentation quick-install
 
 
 
-- 
1.4.4.3.gc902c

[PATCH 2/2] Remove NO_ACCURATE_DIFF options from build systems

[Eric Wong]

The code no longer uses it, as we have --inaccurate-eof in
git-apply.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 Makefile     |    6 ------
 configure.ac |    3 ---
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 5492836..ebc1a17 100644
--- a/Makefile
+++ b/Makefile
@@ -79,9 +79,6 @@ all:
 #
 # Define NO_ICONV if your libc does not properly support iconv.
 #
-# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
-# a missing newline at the end of the file.
-#
 # Define USE_NSEC below if you want git to care about sub-second file mtimes
 # and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
 # it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
@@ -549,9 +546,6 @@ else
 endif
 endif
 endif
-ifdef NO_ACCURATE_DIFF
-	BASIC_CFLAGS += -DNO_ACCURATE_DIFF
-endif
 ifdef NO_PERL_MAKEMAKER
 	export NO_PERL_MAKEMAKER
 endif
diff --git a/configure.ac b/configure.ac
index e153d53..7cfb3a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,9 +235,6 @@ AC_SUBST(NO_SETENV)
 #
 # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
 # Enable it on Windows.  By default, symrefs are still used.
-#
-# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
-# a missing newline at the end of the file.
 
 ## Site configuration (override autodetection)
 ## --with-PACKAGE[=ARG] and --without-PACKAGE
-- 
1.4.4.3.gc902c

Re: [PATCH 1/2] Makefile: add quick-install-doc for installing pre-built manpages

[Junio C Hamano]

Eric Wong <normalperson@yhbt.net> writes:

> This adds and uses the install-doc-quick.sh file to
> Documentation/, which is usable for people who track either the
> 'html' or 'man' heads in Junio's repository.

Sadly I cannot use this myself ;-).

Two points and a half.

(1) DESTDIR traditionally is always used to denote the virtual
    root directory for fake install, typically later to be
    copied over elsewhere or tarred up (e.g. "install git.1
    $(DESTDIR)/usr/share/man/man1/git.1"); I'd suggest to make
    install-doc-quick.sh script take two parameters, the branch
    and the destination directory.

(2) "git-clone" makes my html and man branches tracked with
    remotes/origin/{html,man} by default; you would want to make
    the local tracking branch 'man' you have hardcoded in the
    Makefile overridable and make it default to "origin/man".

(2.5) "chmod +x install-doc-quick.sh", even if you say "sh
      ./..." in your Makefile.


      

[PATCH] Makefile: add quick-install-doc for installing pre-built manpages

[Eric Wong]

This adds and uses the install-doc-quick.sh file to
Documentation/, which is usable for people who track either the
'html' or 'man' heads in Junio's repository (prefixed with
'origin/' if cloned locally).  You may override this by
specifying DOC_REF in the make environment or in config.mak.

GZ may also be set in the environment (or config.mak) if you
wish to gzip the documentation after installing it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 Documentation/Makefile             |    4 ++++
 Documentation/install-doc-quick.sh |   31 +++++++++++++++++++++++++++++++
 Makefile                           |    2 ++
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index d68bc4a..93c7024 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -32,6 +32,7 @@ man7dir=$(mandir)/man7
 # DESTDIR=
 
 INSTALL?=install
+DOC_REF = origin/man
 
 -include ../config.mak.autogen
 
@@ -112,3 +113,6 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
 
 install-webdoc : html
 	sh ./install-webdoc.sh $(WEBDOC_DEST)
+
+quick-install:
+	sh ./install-doc-quick.sh $(DOC_REF) $(mandir)
diff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh
new file mode 100755
index 0000000..a640549
--- /dev/null
+++ b/Documentation/install-doc-quick.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# This requires a branch named in $head
+# (usually 'man' or 'html', provided by the git.git repository)
+set -e
+head="$1"
+mandir="$2"
+SUBDIRECTORY_OK=t
+USAGE='<refname> <target directory>'
+. git-sh-setup
+export GIT_DIR
+
+test -z "$mandir" && usage
+if ! git-rev-parse --verify "$head^0" >/dev/null; then
+	echo >&2 "head: $head does not exist in the current repository"
+	usage
+fi
+
+GIT_INDEX_FILE=`pwd`/.quick-doc.index
+export GIT_INDEX_FILE
+rm -f "$GIT_INDEX_FILE"
+git-read-tree $head
+git-checkout-index -a -f --prefix="$mandir"/
+
+if test -n "$GZ"; then
+	cd "$mandir"
+	for i in `git-ls-tree -r --name-only $head`
+	do
+		gzip < $i > $i.gz && rm $i
+	done
+fi
+rm -f "$GIT_INDEX_FILE"
diff --git a/Makefile b/Makefile
index 4362297..ebc1a17 100644
--- a/Makefile
+++ b/Makefile
@@ -824,6 +824,8 @@ install: all
 install-doc:
 	$(MAKE) -C Documentation install
 
+quick-install-doc:
+	$(MAKE) -C Documentation quick-install
 
 
 
-- 
1.4.4.3.gc902c