From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1123 invoked by alias); 15 Jan 2014 16:33:30 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 1086 invoked by uid 89); 15 Jan 2014 16:33:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_SOFTFAIL autolearn=no version=3.3.2 X-HELO: mtaout22.012.net.il Received: from mtaout22.012.net.il (HELO mtaout22.012.net.il) (80.179.55.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 15 Jan 2014 16:33:28 +0000 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MZG00I00ARPKP00@a-mtaout22.012.net.il> for gdb-patches@sourceware.org; Wed, 15 Jan 2014 18:33:26 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZG00ILUBBPO600@a-mtaout22.012.net.il>; Wed, 15 Jan 2014 18:33:26 +0200 (IST) Date: Wed, 15 Jan 2014 16:33:00 -0000 From: Eli Zaretskii Subject: Re: GDB 7.6.90 available for testing In-reply-to: <52D44439.2020807@redhat.com> To: Pedro Alves Cc: brobecker@adacore.com, gdb-patches@sourceware.org Reply-to: Eli Zaretskii Message-id: <83iotl433i.fsf@gnu.org> References: <20140108101428.C2280E003F@joel.gnat.com> <831u0ec2y6.fsf@gnu.org> <52D427A4.6010704@redhat.com> <83wqi368k7.fsf@gnu.org> <52D43408.404@redhat.com> <83vbxn67ij.fsf@gnu.org> <83sisr66ci.fsf@gnu.org> <52D44439.2020807@redhat.com> X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg00517.txt.bz2 > Date: Mon, 13 Jan 2014 19:53:29 +0000 > From: Pedro Alves > 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.