{"thread":{"id":"6086","subject":"[PATCH 2/2] Remove NO_ACCURATE_DIFF options from build systems","startedAt":"2006-12-23T06:18:02Z","lastAt":"2006-12-23T16:26:09Z","messageCount":4,"participants":["Eric Wong","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"30156","messageId":"11668546833727-git-send-email-normalperson@yhbt.net","threadId":"6086","inReplyTo":null,"subject":"[PATCH 1/2] Makefile: add quick-install-doc for installing pre-built manpages","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-12-23T06:18:02Z","receivedAt":"2006-12-23T06:18:02Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"This adds and uses the install-doc-quick.sh file to\nDocumentation/, which is usable for people who track either the\n'html' or 'man' heads in Junio's repository.\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n Documentation/Makefile             |    3 +++\n Documentation/install-doc-quick.sh |   32 ++++++++++++++++++++++++++++++++\n Makefile                           |    2 ++\n 3 files changed, 37 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex d68bc4a..d563142 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -112,3 +112,6 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt\n \n install-webdoc : html\n \tsh ./install-webdoc.sh $(WEBDOC_DEST)\n+\n+quick-install:\n+\tDESTDIR=$(mandir) sh ./install-doc-quick.sh man\ndiff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh\nnew file mode 100644\nindex 0000000..44ccf60\n--- /dev/null\n+++ b/Documentation/install-doc-quick.sh\n@@ -0,0 +1,32 @@\n+#!/bin/sh\n+# This requires a branch named in $head\n+# (usually 'man' or 'html', provided by the git.git repository)\n+set -e\n+head=\"$1\"\n+if ! git-rev-parse --verify \"$head\" >/dev/null; then\n+\techo >&2 \"head: $head does not exist in the current repository\"\n+\texit 1\n+fi\n+\n+if test -z \"$DESTDIR\"; then\n+\techo >&2 'DESTDIR must be set in the environment'\n+\texit 1\n+fi\n+\n+GIT_INDEX_FILE=`pwd`/.quick-doc.index\n+export GIT_INDEX_FILE\n+rm -f \"$GIT_INDEX_FILE\"\n+SUBDIRECTORY_OK=t\n+. git-sh-setup\n+export GIT_DIR\n+git-read-tree $head\n+git-checkout-index -a -f --prefix=\"$DESTDIR\"/\n+\n+if test -n \"$GZ\"; then\n+\tcd \"$DESTDIR\"\n+\tfor i in `git-ls-tree -r --name-only $head`\n+\tdo\n+\t\tgzip < $i > $i.gz && rm $i\n+\tdone\n+fi\n+rm -f \"$GIT_INDEX_FILE\"\ndiff --git a/Makefile b/Makefile\nindex 7651104..5492836 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -830,6 +830,8 @@ install: all\n install-doc:\n \t$(MAKE) -C Documentation install\n \n+quick-install-doc:\n+\t$(MAKE) -C Documentation quick-install\n \n \n \n-- \n1.4.4.3.gc902c\n"},{"id":"30155","messageId":"1166854684559-git-send-email-normalperson@yhbt.net","threadId":"6086","inReplyTo":"11668546833727-git-send-email-normalperson@yhbt.net","subject":"[PATCH 2/2] Remove NO_ACCURATE_DIFF options from build systems","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-12-23T06:18:03Z","receivedAt":"2006-12-23T06:18:03Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"The code no longer uses it, as we have --inaccurate-eof in\ngit-apply.\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n Makefile     |    6 ------\n configure.ac |    3 ---\n 2 files changed, 0 insertions(+), 9 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 5492836..ebc1a17 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -79,9 +79,6 @@ all:\n #\n # Define NO_ICONV if your libc does not properly support iconv.\n #\n-# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses\n-# a missing newline at the end of the file.\n-#\n # Define USE_NSEC below if you want git to care about sub-second file mtimes\n # and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and\n # it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely\n@@ -549,9 +546,6 @@ else\n endif\n endif\n endif\n-ifdef NO_ACCURATE_DIFF\n-\tBASIC_CFLAGS += -DNO_ACCURATE_DIFF\n-endif\n ifdef NO_PERL_MAKEMAKER\n \texport NO_PERL_MAKEMAKER\n endif\ndiff --git a/configure.ac b/configure.ac\nindex e153d53..7cfb3a0 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -235,9 +235,6 @@ AC_SUBST(NO_SETENV)\n #\n # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.\n # Enable it on Windows.  By default, symrefs are still used.\n-#\n-# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses\n-# a missing newline at the end of the file.\n \n ## Site configuration (override autodetection)\n ## --with-PACKAGE[=ARG] and --without-PACKAGE\n-- \n1.4.4.3.gc902c\n"},{"id":"30180","messageId":"7virg3t54l.fsf@assigned-by-dhcp.cox.net","threadId":"6086","inReplyTo":"11668546833727-git-send-email-normalperson@yhbt.net","subject":"Re: [PATCH 1/2] Makefile: add quick-install-doc for installing pre-built manpages","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-23T07:59:06Z","receivedAt":"2006-12-23T07:59:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong <normalperson@yhbt.net> writes:\n\n> This adds and uses the install-doc-quick.sh file to\n> Documentation/, which is usable for people who track either the\n> 'html' or 'man' heads in Junio's repository.\n\nSadly I cannot use this myself ;-).\n\nTwo points and a half.\n\n(1) DESTDIR traditionally is always used to denote the virtual\n    root directory for fake install, typically later to be\n    copied over elsewhere or tarred up (e.g. \"install git.1\n    $(DESTDIR)/usr/share/man/man1/git.1\"); I'd suggest to make\n    install-doc-quick.sh script take two parameters, the branch\n    and the destination directory.\n\n(2) \"git-clone\" makes my html and man branches tracked with\n    remotes/origin/{html,man} by default; you would want to make\n    the local tracking branch 'man' you have hardcoded in the\n    Makefile overridable and make it default to \"origin/man\".\n\n(2.5) \"chmod +x install-doc-quick.sh\", even if you say \"sh\n      ./...\" in your Makefile.\n\n\n      \n"},{"id":"30206","messageId":"20061223162609.GA23084@localdomain","threadId":"6086","inReplyTo":"7virg3t54l.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH] Makefile: add quick-install-doc for installing pre-built manpages","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-12-23T16:26:09Z","receivedAt":"2006-12-23T16:26:09Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"This adds and uses the install-doc-quick.sh file to\nDocumentation/, which is usable for people who track either the\n'html' or 'man' heads in Junio's repository (prefixed with\n'origin/' if cloned locally).  You may override this by\nspecifying DOC_REF in the make environment or in config.mak.\n\nGZ may also be set in the environment (or config.mak) if you\nwish to gzip the documentation after installing it.\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n Documentation/Makefile             |    4 ++++\n Documentation/install-doc-quick.sh |   31 +++++++++++++++++++++++++++++++\n Makefile                           |    2 ++\n 3 files changed, 37 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex d68bc4a..93c7024 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -32,6 +32,7 @@ man7dir=$(mandir)/man7\n # DESTDIR=\n \n INSTALL?=install\n+DOC_REF = origin/man\n \n -include ../config.mak.autogen\n \n@@ -112,3 +113,6 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt\n \n install-webdoc : html\n \tsh ./install-webdoc.sh $(WEBDOC_DEST)\n+\n+quick-install:\n+\tsh ./install-doc-quick.sh $(DOC_REF) $(mandir)\ndiff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh\nnew file mode 100755\nindex 0000000..a640549\n--- /dev/null\n+++ b/Documentation/install-doc-quick.sh\n@@ -0,0 +1,31 @@\n+#!/bin/sh\n+# This requires a branch named in $head\n+# (usually 'man' or 'html', provided by the git.git repository)\n+set -e\n+head=\"$1\"\n+mandir=\"$2\"\n+SUBDIRECTORY_OK=t\n+USAGE='<refname> <target directory>'\n+. git-sh-setup\n+export GIT_DIR\n+\n+test -z \"$mandir\" && usage\n+if ! git-rev-parse --verify \"$head^0\" >/dev/null; then\n+\techo >&2 \"head: $head does not exist in the current repository\"\n+\tusage\n+fi\n+\n+GIT_INDEX_FILE=`pwd`/.quick-doc.index\n+export GIT_INDEX_FILE\n+rm -f \"$GIT_INDEX_FILE\"\n+git-read-tree $head\n+git-checkout-index -a -f --prefix=\"$mandir\"/\n+\n+if test -n \"$GZ\"; then\n+\tcd \"$mandir\"\n+\tfor i in `git-ls-tree -r --name-only $head`\n+\tdo\n+\t\tgzip < $i > $i.gz && rm $i\n+\tdone\n+fi\n+rm -f \"$GIT_INDEX_FILE\"\ndiff --git a/Makefile b/Makefile\nindex 4362297..ebc1a17 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -824,6 +824,8 @@ install: all\n install-doc:\n \t$(MAKE) -C Documentation install\n \n+quick-install-doc:\n+\t$(MAKE) -C Documentation quick-install\n \n \n \n-- \n1.4.4.3.gc902c\n"}]}