Re: GDB 7.6.90 available for testing

Eli Zaretskii
2014-01-15T16:33:30Z

> Date: Mon, 13 Jan 2014 19:53:29 +0000
> From: Pedro Alves <palves@redhat.com>
> CC: brobecker@adacore.com, gdb-patches@sourceware.org
>
> > It seems msysgit's cherry-pick somehow converted gdbserver/ChangeLog
> > to DOS CRLF EOL format. So I needed one additional commit on the
> > branch to fix that, before pushing. Is that OK, or should I have done
> > something different?
>
> Ouch, sounds like a git bug...

For the record: it's not a git bug. It's a bug in git-merge-changelog
when it is built on Windows: it uses text-mode I/O. It didn't come
with git, I built it myself.

I guess cherry-pick of a ChangeLog counts as a merge operation, so git
invoked git-merge-changelog, which is installed here as a merge driver
for ChangeLog files.

So now I need to fix the Windows build of git-merge-changelog to avoid
this problem in the future.