Re: [biseced bug] make info fails with master

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 13, 2008, 00:12 UTC
Message-ID: <7v4p7yyyzg.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080605234016.GO29404@genesis.frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

Show 6 quoted lines

> make info seem to fails here recently.
> ...
> The commit obviously touches this part of the documentation but I don't see
> where the bug is.
>
> I'm not sure, maybe this is a bug in the toolchain?

I've made a few changes to work these around but haven't pushed the results out. Here is a preview of two relevant commits.

The *NOTE:* thing could be new but @pxref{[REMOTES]} thing has been with us from very beginning and we already had a similar workaround for it.

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 5f55f64..d0f1595 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -38,7 +38,8 @@ include::merge-options.txt[]
 	for branch `<name>`, set configuration `branch.<name>.rebase`
 	to `true`.
 +
-*NOTE:* This is a potentially _dangerous_ mode of operation.
+[NOTE]
+This is a potentially _dangerous_ mode of operation.
 It rewrites history, which does not bode well when you
 published that history already.  Do *not* use this option
 unless you have read linkgit:git-rebase[1] carefully.


diff --git a/Documentation/cat-texi.perl b/Documentation/cat-texi.perl
index e3d8e9f..dbc133c 100755
--- a/Documentation/cat-texi.perl
+++ b/Documentation/cat-texi.perl
@@ -11,7 +11,7 @@ while (<STDIN>) {
 	if (s/^\@top (.*)/\@node $1,,,Top/) {
 		push @menu, $1;
 	}
-	s/\(\@pxref{\[URLS\]}\)//;
+	s/\(\@pxref{\[(URLS|REMOTES)\]}\)//;
 	print TMP;
 }
 close TMP;