Re: Bug#563882: git-core FTBFS on ia64: t1001-read-tree-m-2way.sh test fails
On 2010-01-09 Jonathan Nieder <jrnieder@gmail.com> wrote:
[...]
> Instead, it appears that
> git diff --no-index M.out 4.out >4diff.out
> is not writing the output it should. To test this hypothesis, it
> would be nice to use a copy of git built with DEB_BUILD_OPTIONS=nocheck
> to compare
> -- %< -- M.out
> 100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0 bozbar
> 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
> 100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
> -- >% --
> with
> -- %< -- 4.out
> 100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0 bozbar
> 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
> 100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
> 100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0 yomin
> -- >% --
> using 'git diff --no-index M.out 4.out'.
> Sorry for the confusion.
Hello,
I have not built with DEB_BUILD_OPTIONS=nocheck but have simply used
the builtree from the regular build on merulo.
ametzler@merulo:/tmp/GIT/git-core-1.6.6/t/trash directory.t1001-read-tree-m-2way$ /tmp/GIT/git-core-1.6.6/git diff --no-index M.out 4.out
diff --git a/M.out b/4.out
index 4aefa95..d5ec90a 100644
Binary files a/M.out and b/4.out differ
ametzler@merulo:/tmp/GIT/git-core-1.6.6/t/trash directory.t1001-read-tree-m-2way$ cat M.out
100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
ametzler@merulo:/tmp/GIT/git-core-1.6.6/t/trash directory.t1001-read-tree-m-2way$ cat 4.out
100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0 yomin
-------------------
For comparison on i386 the output of
/tmp/GIT/git-core-1.6.6/git diff --no-index M.out 4.out
looks like this instead of "Binary files a/M.out and b/4.out differ":
diff --git a/M.out b/4.out
index 4aefa95..d5ec90a 100644
--- a/M.out
+++ b/4.out
@@ -1,3 +1,4 @@
100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
+100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0 yomin
cu andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
Reply to: