[PATCH 0/3] Build fixes for v1.2.4-gc9e9f1a

[PATCH 0/3] Build fixes for v1.2.4-gc9e9f1a

[Mark Wooding]

The master branch, as of c9e9f1ad8aae4bd49791d53cc0cd501120884850,
doesn't build cleanly for me.  There's a warning about git.c, warnings
about Documentation/git-cvsserver.txt, and an abject failure to process
Documentation/git-tools.txt.

The following patches fix these problems, at least for me.

For reference, I'm running

  * gcc (GCC) 4.0.3 20060212 (prerelease) (Debian 4.0.2-9)
  * asciidoc 7.0.2

-- [mdw]

[PATCH 1/3] git.c: Kill type mismatch warning.

[Mark Wooding]

From: Mark Wooding <mdw@distorted.org.uk>

GCC objects when you pass a `char **' where a `const char **' is wanted.
The cast shuts the compiler up, and does the right thing generally.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
---

Unfortunately, the warning is fair enough.  I can pass a `T' where
someone was expecting a `const T', but that would mean that the callee
was expecting a `char *const *'.
---

 git.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git.c b/git.c
index a547dbd..69df070 100644
--- a/git.c
+++ b/git.c
@@ -261,7 +261,7 @@ static int cmd_log(int argc, char **argv
 	int show_parents = 0;
 	const char *commit_prefix = "commit ";
 
-	argc = setup_revisions(argc, argv, &rev, "HEAD");
+	argc = setup_revisions(argc, (const char **)argv, &rev, "HEAD");
 	while (1 < argc) {
 		char *arg = argv[1];
 		if (!strncmp(arg, "--pretty", 8)) {

[PATCH 2/3] Documentation/Makefile: Some `git-*.txt' files aren't manpages.

[Mark Wooding]

From: Mark Wooding <mdw@distorted.org.uk>

In particular, git-tools.txt isn't a manpage, and my Asciidoc gets upset
by it.  The simplest fix is to Remove articles from the list of manpages
the Makefile.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
---

 Documentation/Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index a3bca86..f4cbf7e 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,4 +1,7 @@
-MAN1_TXT=$(wildcard git-*.txt) gitk.txt
+MAN1_TXT= \
+	$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
+		$(wildcard git-*.txt)) \
+	gitk.txt
 MAN7_TXT=git.txt
 
 DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
@@ -11,6 +14,7 @@ ARTICLES += howto-index
 ARTICLES += repository-layout
 ARTICLES += hooks
 ARTICLES += everyday
+ARTICLES += git-tools
 # with their own formatting rules.
 SP_ARTICLES = glossary howto/revert-branch-rebase
 

[PATCH 3/3] Documentation/git-cvsserver.txt: Fix list numbering.

[Mark Wooding]

From: Mark Wooding <mdw@distorted.org.uk>

Asciidoc complains about the bogus list item numbers in the installation
instructions.  Fix them.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
---

 Documentation/git-cvsserver.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 19c9c51..0c4948d 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -44,13 +44,13 @@ INSTALLATION
    n.b. you need to ensure each user that is going to invoke server.pl has
    write access to the log file.
 
-5. On each client machine you need to set the following variables.
+3. On each client machine you need to set the following variables.
      CVSROOT should be set as per normal, but the directory should point at the
              appropriate git repo.
      CVS_SERVER should be set to the server.pl script that has been put on the
                 remote machine.
 
-6. Clients should now be able to check out modules (where modules are the names
+4. Clients should now be able to check out modules (where modules are the names
    of branches in git).
      $ cvs co -d mylocaldir master