mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Randall S. Becker" <>
To: "'Junio C Hamano'" <>
Cc: <>
Subject: RE: [Proposed] Externalize man/html ref for quick-install-man and quick-install-html
Date: Tue, 12 Dec 2017 18:23:35 -0500	[thread overview]
Message-ID: <004b01d373a0$3ec759d0$bc560d70$> (raw)
In-Reply-To: <>

-----Original Message-----
On December 12, 2017 6:18 PM Junio C Hamano wrote:
Subject: Re: [Proposed] Externalize man/html ref for quick-install-man and quick-install-html
>"Randall S. Becker" <> writes:
>> I can send you a pull request on github, if you want 😉
>I don't.  It's not that I can or cannot take a pull request.  I just do not want to queue anything that is not reviwed on list.
No worries.

>I however could queue this (typed to mimic what I saw in your message), but you'd need to say what you see here is OK (and preferably, you applied this version and it tested fine); I may have made a typo or two, and I would really prefer extra set of eyes.
Yes, needed. The lines wrapped om Documentation/Makefile - each change in quick-install-man/html should be exactly one line:

quick-install-man: require-manrepo
-	'$(SHELL_PATH_SQ)' ./ $(MAN_REPO) $(DESTDIR)$(mandir)
+	'$(SHELL_PATH_SQ)' ./ $(MAN_REPO) $(DESTDIR)$(mandir) $(GIT_MAN_REF)
And here

 quick-install-html: require-htmlrepo
-	'$(SHELL_PATH_SQ)' ./ $(HTML_REPO) $(DESTDIR)$(htmldir)
+	'$(SHELL_PATH_SQ)' ./ $(HTML_REPO) $(DESTDIR)$(htmldir) $(GIT_MAN_REF)

And otherwise please consider it signed off.

Signed-off-by: Randall S. Becker <>

-- >8 --
From: "Randall S. Becker" <>
Date: Sat, 9 Dec 2017 17:07:57 -0500
Subject: [PATCH] install-doc-quick: allow specifying what ref to install

We allow the builders, who want to install the preformatted manpages and html documents, to specify where in their filesystem these two repositories are stored.  Let them also specify which ref (or even a
revision) to grab the preformatted material from.
 Documentation/Makefile             | 5 +++--
 Documentation/ | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile index 2ab65561af..4ae9ba5c86 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -39,6 +39,7 @@ MAN7_TXT += gitworkflows.txt  MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)  MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))  MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
+GIT_MAN_REF = master
 OBSOLETE_HTML += everyday.html
 OBSOLETE_HTML += git-remote-helpers.html @@ -437,14 +438,14 @@ require-manrepo::
 	then echo "git-manpages repository must exist at $(MAN_REPO)"; exit 1; fi
 quick-install-man: require-manrepo
-	'$(SHELL_PATH_SQ)' ./ $(MAN_REPO) $(DESTDIR)$(mandir)
+	'$(SHELL_PATH_SQ)' ./ $(MAN_REPO) 
+$(DESTDIR)$(mandir) $(GIT_MAN_REF)
 	@if test ! -d $(HTML_REPO); \
 	then echo "git-htmldocs repository must exist at $(HTML_REPO)"; exit 1; fi
 quick-install-html: require-htmlrepo
-	'$(SHELL_PATH_SQ)' ./ $(HTML_REPO) $(DESTDIR)$(htmldir)
+$(DESTDIR)$(htmldir) $(GIT_MAN_REF)
 	@for i in $(MAN1_TXT); do echo $$i; done diff --git a/Documentation/ b/Documentation/
index 327f69bcf5..17231d8e59 100755
--- a/Documentation/
+++ b/Documentation/
@@ -3,11 +3,12 @@
-head=master GIT_DIR=
 for d in "$repository/.git" "$repository"
-	if GIT_DIR="$d" git rev-parse refs/heads/master >/dev/null 2>&1
+	if GIT_DIR="$d" git rev-parse "$GIT_MAN_REF" >/dev/null 2>&1
 		export GIT_DIR
@@ -27,12 +28,12 @@ export GIT_INDEX_FILE GIT_WORK_TREE  rm -f "$GIT_INDEX_FILE"
 trap 'rm -f "$GIT_INDEX_FILE"' 0
-git read-tree $head
+git read-tree "$GIT_MAN_REF"
 git checkout-index -a -f --prefix="$destdir"/
 if test -n "$GZ"
-	git ls-tree -r --name-only $head |
+	git ls-tree -r --name-only "$GIT_MAN_REF" |
 	xargs printf "$destdir/%s\n" |
 	xargs gzip -f

  reply	other threads:[~2017-12-12 23:23 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-09 22:07 [Proposed] Externalize man/html ref for quick-install-man and quick-install-html Randall S. Becker
2017-12-11 23:27 ` Junio C Hamano
2017-12-12  0:26   ` Randall S. Becker
2017-12-12 10:50     ` Jacob Keller
2017-12-12 23:17     ` Junio C Hamano
2017-12-12 23:23       ` Randall S. Becker [this message]
2017-12-12 23:40         ` Junio C Hamano
2017-12-12 23:54           ` Randall S. Becker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='004b01d373a0$3ec759d0$bc560d70$' \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).