Re: git-core FTBFS on ia64: t1001-read-tree-m-2way.sh test fails
Jonathan Nieder wrote:
> So far so good, as the read_tree_twoway output reveals:
>
> | 100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0 bozbar
> | 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
> | 100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
> | 100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0 yomin
>
> This listing is saved in 4.out. That file is diffed against M.out
> to emphasize the yomin index entry. We expect something like
>
> ... diff header ...
> +100644 0a41e115ab61be...16 0 yomin
>
> to demonstrate that yomin is still in the index. But instead,
> 4diff.out is empty!
>
> That is, yomin has been deleted from the index for some reason,
> but only on the ia64.
Clearly I am half-asleep. yomin is still in the index, as the
read_tree_twoway output reveals. ;-)
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.
Good night,
Jonathan
Reply to: