Re: Bug#563882: git-core FTBFS on ia64: t1001-read-tree-m-2way.sh test fails
On 2010-01-25 Jonathan Nieder <email@example.com> wrote:
> Andreas Metzler wrote:
> > Binary files a/M.out and b/4.out differ
> Hi Andreas and ia64 porters,
> If you find time, could you save the is-binary.c in the git source
> tree and try
> make git-is-binary
> <M.out ./git-is-binary M.out 4.out
> with M.out and 4.out as above?
> The idea is to see where binary file detection screws up. My
> current wild guess is that mmap() is misbehaving.
ametzler@merulo:/tmp/GIT/git-core-1.6.6-debug/t/trash directory.t1001-read-tree-m-2way$ <M.out /tmp/GIT/git-core-1.6.6-debug/git-is-binary M.out 4.out
static buffer is not binary
stdin is not binary
M.out is binary
4.out is not binary
> I’ve also attached a diff-debug.patch to ask git diff to reveal
> which file it considers binary.
ametzler@merulo:/tmp/GIT/git-core-1.6.6-debug/t/trash directory.t1001-read-tree-m-2way$ /tmp/GIT/git-core-1.6.6-debug/git-diff --no-index M.out 4.out
a/M.out is binary
b/4.out is binary
diff --git a/M.out b/4.out
index 4aefa95..d5ec90a 100644
Binary files a/M.out and b/4.out differ
FWIW all versions of git-diff I tried (1.6.6, 1.6.5, and 184.108.40.206)
report "Binary files a/M.out and b/4.out differ".