mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Randall S. Becker" <>
To: <>
Subject: [Proposed] Externalize man/html ref for quick-install-man and quick-install-html
Date: Sat, 9 Dec 2017 17:07:57 -0500	[thread overview]
Message-ID: <000801d3713a$2f1259d0$8d370d70$> (raw)

I am proposing the following trivial change to allow the external
specification of the reference used for quick-install-man. The justification
is that I cannot have my production team modifying scripts when non-master
versions of git are installed in production (that violates so many rules
that I would have trouble enumerating). This does add any requirements for
changes to the automation for building either git-manpages or  git-htmldocs.
What it does is allow the top level make to pass GIT_MAN_REF down to the
underlying shell script with a default of master if unspecific. Where I am
uncertain is what else would be required for this change (documentation,
unit tests).

I humbly submit this for consideration.

From 6acc4a4238b3e3e62674bf8a5d0b9084258a0967 Mon Sep 17 00:00:00 2001
From: "Randall S. Becker" <>
Date: Sat, 9 Dec 2017 15:52:44 -0600
Subject: Externalize man/html ref for quick-install-man and

 Documentation/Makefile             | 6 ++++--
 Documentation/ | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3e39e28..4f1e6df 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -39,6 +39,8 @@ 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
@@ -415,14 +417,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)
+       '$(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)
+       '$(SHELL_PATH_SQ)' ./ $(HTML_REPO)
$(DESTDIR)$(htmldir) $(GIT_MAN_REF)

        @for i in $(MAN1_TXT); do echo $$i; done
diff --git a/Documentation/
index 327f69b..a7715eb 100755
--- a/Documentation/
+++ b/Documentation/
@@ -4,7 +4,8 @@

-head=master GIT_DIR=
 for d in "$repository/.git" "$repository"
        if GIT_DIR="$d" git rev-parse refs/heads/master >/dev/null 2>&1
@@ -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-09 22:08 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-09 22:07 Randall S. Becker [this message]
2017-12-11 23:27 ` [Proposed] Externalize man/html ref for quick-install-man and quick-install-html 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
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='000801d3713a$2f1259d0$8d370d70$' \ \ \

* 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).