{"thread":{"id":"3563","subject":"[PATCH 2/3] Documentation/Makefile: Some `git-*.txt' files aren't manpages.","startedAt":"2006-03-05T09:33:51Z","lastAt":"2006-03-05T09:36:35Z","messageCount":4,"participants":["Mark Wooding"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"17174","messageId":"20060305093351.26650.84677.stgit@metalzone.distorted.org.uk","threadId":"3563","inReplyTo":null,"subject":"[PATCH 0/3] Build fixes for v1.2.4-gc9e9f1a","fromName":"Mark Wooding","fromEmail":"mdw@distorted.org.uk","sentAt":"2006-03-05T09:33:51Z","receivedAt":"2006-03-05T09:33:51Z","isPatch":true,"sender":{"key":"mdw@distorted.org.uk","avatar":null},"body":"The master branch, as of c9e9f1ad8aae4bd49791d53cc0cd501120884850,\ndoesn't build cleanly for me.  There's a warning about git.c, warnings\nabout Documentation/git-cvsserver.txt, and an abject failure to process\nDocumentation/git-tools.txt.\n\nThe following patches fix these problems, at least for me.\n\nFor reference, I'm running\n\n  * gcc (GCC) 4.0.3 20060212 (prerelease) (Debian 4.0.2-9)\n  * asciidoc 7.0.2\n\n-- [mdw]\n"},{"id":"17175","messageId":"20060305093630.26650.91571.stgit@metalzone.distorted.org.uk","threadId":"3563","inReplyTo":"20060305093351.26650.84677.stgit@metalzone.distorted.org.uk","subject":"[PATCH 1/3] git.c: Kill type mismatch warning.","fromName":"Mark Wooding","fromEmail":"mdw@distorted.org.uk","sentAt":"2006-03-05T09:36:31Z","receivedAt":"2006-03-05T09:36:31Z","isPatch":true,"sender":{"key":"mdw@distorted.org.uk","avatar":null},"body":"From: Mark Wooding <mdw@distorted.org.uk>\n\nGCC objects when you pass a `char **' where a `const char **' is wanted.\nThe cast shuts the compiler up, and does the right thing generally.\n\nSigned-off-by: Mark Wooding <mdw@distorted.org.uk>\n---\n\nUnfortunately, the warning is fair enough.  I can pass a `T' where\nsomeone was expecting a `const T', but that would mean that the callee\nwas expecting a `char *const *'.\n---\n\n git.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git.c b/git.c\nindex a547dbd..69df070 100644\n--- a/git.c\n+++ b/git.c\n@@ -261,7 +261,7 @@ static int cmd_log(int argc, char **argv\n \tint show_parents = 0;\n \tconst char *commit_prefix = \"commit \";\n \n-\targc = setup_revisions(argc, argv, &rev, \"HEAD\");\n+\targc = setup_revisions(argc, (const char **)argv, &rev, \"HEAD\");\n \twhile (1 < argc) {\n \t\tchar *arg = argv[1];\n \t\tif (!strncmp(arg, \"--pretty\", 8)) {\n"},{"id":"17173","messageId":"20060305093633.26650.65452.stgit@metalzone.distorted.org.uk","threadId":"3563","inReplyTo":"20060305093351.26650.84677.stgit@metalzone.distorted.org.uk","subject":"[PATCH 2/3] Documentation/Makefile: Some `git-*.txt' files aren't manpages.","fromName":"Mark Wooding","fromEmail":"mdw@distorted.org.uk","sentAt":"2006-03-05T09:36:33Z","receivedAt":"2006-03-05T09:36:33Z","isPatch":true,"sender":{"key":"mdw@distorted.org.uk","avatar":null},"body":"From: Mark Wooding <mdw@distorted.org.uk>\n\nIn particular, git-tools.txt isn't a manpage, and my Asciidoc gets upset\nby it.  The simplest fix is to Remove articles from the list of manpages\nthe Makefile.\n\nSigned-off-by: Mark Wooding <mdw@distorted.org.uk>\n---\n\n Documentation/Makefile |    6 +++++-\n 1 files changed, 5 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex a3bca86..f4cbf7e 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -1,4 +1,7 @@\n-MAN1_TXT=$(wildcard git-*.txt) gitk.txt\n+MAN1_TXT= \\\n+\t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n+\t\t$(wildcard git-*.txt)) \\\n+\tgitk.txt\n MAN7_TXT=git.txt\n \n DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))\n@@ -11,6 +14,7 @@ ARTICLES += howto-index\n ARTICLES += repository-layout\n ARTICLES += hooks\n ARTICLES += everyday\n+ARTICLES += git-tools\n # with their own formatting rules.\n SP_ARTICLES = glossary howto/revert-branch-rebase\n \n"},{"id":"17176","messageId":"20060305093635.26650.13163.stgit@metalzone.distorted.org.uk","threadId":"3563","inReplyTo":"20060305093351.26650.84677.stgit@metalzone.distorted.org.uk","subject":"[PATCH 3/3] Documentation/git-cvsserver.txt: Fix list numbering.","fromName":"Mark Wooding","fromEmail":"mdw@distorted.org.uk","sentAt":"2006-03-05T09:36:35Z","receivedAt":"2006-03-05T09:36:35Z","isPatch":true,"sender":{"key":"mdw@distorted.org.uk","avatar":null},"body":"From: Mark Wooding <mdw@distorted.org.uk>\n\nAsciidoc complains about the bogus list item numbers in the installation\ninstructions.  Fix them.\n\nSigned-off-by: Mark Wooding <mdw@distorted.org.uk>\n---\n\n Documentation/git-cvsserver.txt |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt\nindex 19c9c51..0c4948d 100644\n--- a/Documentation/git-cvsserver.txt\n+++ b/Documentation/git-cvsserver.txt\n@@ -44,13 +44,13 @@ INSTALLATION\n    n.b. you need to ensure each user that is going to invoke server.pl has\n    write access to the log file.\n \n-5. On each client machine you need to set the following variables.\n+3. On each client machine you need to set the following variables.\n      CVSROOT should be set as per normal, but the directory should point at the\n              appropriate git repo.\n      CVS_SERVER should be set to the server.pl script that has been put on the\n                 remote machine.\n \n-6. Clients should now be able to check out modules (where modules are the names\n+4. Clients should now be able to check out modules (where modules are the names\n    of branches in git).\n      $ cvs co -d mylocaldir master\n \n"}]}