This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: GDB 7.6.90 available for testing
- From: Eli Zaretskii <eliz at gnu dot org>
- To: Pedro Alves <palves at redhat dot com>
- Cc: brobecker at adacore dot com, gdb-patches at sourceware dot org
- Date: Wed, 15 Jan 2014 18:33:21 +0200
- Subject: Re: GDB 7.6.90 available for testing
- Authentication-results: sourceware.org; auth=none
- References: <20140108101428 dot C2280E003F at joel dot gnat dot com> <831u0ec2y6 dot fsf at gnu dot org> <52D427A4 dot 6010704 at redhat dot com> <83wqi368k7 dot fsf at gnu dot org> <52D43408 dot 404 at redhat dot com> <83vbxn67ij dot fsf at gnu dot org> <83sisr66ci dot fsf at gnu dot org> <52D44439 dot 2020807 at redhat dot com>
- Reply-to: Eli Zaretskii <eliz at gnu dot org>
> 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.