[biseced bug] make info fails with master

[biseced bug] make info fails with master

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]

Hi,

make info seem to fails here recently.

The error message is:

makeinfo --no-split gitman.texi
gitman.texi:17311: warning: @strong{Note...} produces a spurious cross-reference in Info; reword to avoid that.
/home/vmiklos/git/git/Documentation//gitman.texi:17377: Cross reference to nonexistent node `[REMOTES]' (perhaps incorrect sectioning?).
/home/vmiklos/git/git/Documentation//gitman.texi:11439: Cross reference to nonexistent node `[REMOTES]' (perhaps incorrect sectioning?).
makeinfo: Removing output file `/home/vmiklos/git/git/Documentation/gitman.info' due to errors; use --force to preserve.
make[1]: *** [gitman.info] Error 1
make[1]: Leaving directory `/home/vmiklos/git/git/Documentation'
make: *** [info] Error 2

Here is what i did:

$ cat ~/bin/gittest
#!/bin/sh

make info DOCBOOK2X_TEXI=docbook2texi
exit $?

$ git bisect start
$ git bisect bad master
$ git bisect good v1.5.6-rc0
$ git bisect run ~/bin/gittest

It says:

5812473335161e3d8e5a1e085c5894a247472bdb is first bad commit

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?

Thanks.

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [biseced bug] make info fails with master

[Junio C Hamano]

Miklos Vajna <vmiklos@frugalware.org> writes:

> 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;

Re: [biseced bug] make info fails with master

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

On Thu, Jun 12, 2008 at 05:12:19PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> 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.

Thanks, it solves the problem for me!

Tested-by: Miklos Vajna <vmiklos@frugalware.org>

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]