From: Eli Zaretskii <eliz@gnu.org>
To: Pedro Alves <palves@redhat.com>
Cc: brobecker@adacore.com, gdb-patches@sourceware.org
Subject: Re: GDB 7.6.90 available for testing
Date: Wed, 15 Jan 2014 16:33:00 -0000 [thread overview]
Message-ID: <83iotl433i.fsf@gnu.org> (raw)
In-Reply-To: <52D44439.2020807@redhat.com>
> 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.
next prev parent reply other threads:[~2014-01-15 16:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-08 10:14 Joel Brobecker
2014-01-08 18:18 ` Reini Urban
2014-01-09 2:46 ` Joel Brobecker
2014-01-09 17:07 ` Tom Tromey
2014-01-10 4:25 ` Joel Brobecker
2014-01-10 1:52 ` Yao Qi
2014-01-09 18:27 ` Regressions on s390x RHEL-6.5 (was: Re: GDB 7.6.90 available for testing) Sergio Durigan Junior
2014-01-11 8:56 ` GDB 7.6.90 available for testing Eli Zaretskii
2014-01-13 17:33 ` Eli Zaretskii
2014-01-13 17:51 ` Pedro Alves
2014-01-13 18:28 ` Eli Zaretskii
2014-01-13 18:44 ` Pedro Alves
2014-01-13 18:50 ` Eli Zaretskii
2014-01-13 19:15 ` Eli Zaretskii
2014-01-13 19:53 ` Pedro Alves
2014-01-13 20:33 ` Eli Zaretskii
2014-01-15 16:33 ` Eli Zaretskii [this message]
2014-01-13 10:29 ` Ricard Wanderlof
2014-01-13 10:37 ` Joel Brobecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83iotl433i.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).