From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karl Brand Subject: Re: How to avoid the ^M induced by Meld and Git Date: Wed, 12 Dec 2012 16:34:27 +0100 Message-ID: <50C8A403.9050304@erasmusmc.nl> References: <50C72821.10908@erasmusmc.nl> <50C89B68.8090309@drmicha.warpmail.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: Michael J Gruber X-From: git-owner@vger.kernel.org Wed Dec 12 16:34:56 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TioKd-0005eG-Ud for gcvg-git-2@plane.gmane.org; Wed, 12 Dec 2012 16:34:48 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754129Ab2LLPea (ORCPT ); Wed, 12 Dec 2012 10:34:30 -0500 Received: from rbox2.erasmusmc.nl ([156.83.10.12]:62520 "EHLO rbox2.erasmusmc.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276Ab2LLPe3 (ORCPT ); Wed, 12 Dec 2012 10:34:29 -0500 Received: from rbox2.erasmusmc.nl (localhost.erasmusmc.nl [127.0.0.1]) by rbox2.erasmusmc.nl (Postfix) with ESMTP id 386596D4137; Wed, 12 Dec 2012 16:34:28 +0100 (CET) X-Virus-Scanned: amavisd-new at erasmusmc.nl Received: from rbox2.erasmusmc.nl ([127.0.0.1]) by rbox2.erasmusmc.nl (rbox2.erasmusmc.nl [127.0.0.1]) (amavisd-new, port 10024) with LMTP id EFrJJ8PqiO-0; Wed, 12 Dec 2012 16:34:28 +0100 (CET) Received: from [10.92.2.214] (4jh5p4j.erasmusmc.nl [10.92.2.214]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: 117730) by rbox2.erasmusmc.nl (Postfix) with ESMTPSA id DF9EC6D4131; Wed, 12 Dec 2012 16:34:27 +0100 (CET) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 In-Reply-To: <50C89B68.8090309@drmicha.warpmail.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 12/12/12 15:57, Michael J Gruber wrote: > Karl Brand venit, vidit, dixit 11.12.2012 13:33: >> Esteemed Git users, >> >> What i do: >> >> 1. Create a script.r using Emacs/ESS. >> 2. Make some modifications to script.r with the nice diff gui, Meld >> 3. Commit these modifications using git commit -am "my message" >> 4. Reopen script.r in Emacs/ESS to continue working. >> >> The lines added (&/edited ?) using Meld all end with ^M which i >> certainly don't want. Lines not added/edited with Meld do NOT end with ^M. > > What happens if you leave out step 3? If the same happens then Meld is > the culprit. (Unless you've set some special options, git does not > modify your file on commit, so this can't be git related.) > Leaving out step 3. results in exactly the same thing. Thus Git doesn't appear to be responsible for the ^M's. Thanks a lot for your effort on this and my apologies for not taking the care to dissect this more carefully as you suggested. Over to the Meld mailing list... >> There are plenty of posts around about these being line endings used for >> windows which can appear when working on a script under a *nix OS which >> has previously been edited in a Windows OS. This is not the case here - >> everything is taking place on Ubuntu 12.04. >> >> FWIW: the directory is being synced by dropbox; and in Meld, Preferences >> > Encoding tab, "utf8" is entered in the text box. >> >> Current work around is running in a terminal: dos2unix /path/to/script.r >> which strips the ^M's >> >> But this just shouldn't be necessary and I'd really appreciate the >> reflections & advice on how to stop inducing these ^M's ! >> >> With thanks, >> >> Karl >> >> (re)posted here as suggested off topic at SO: >> http://stackoverflow.com/questions/13799631/create-script-r-in-emacs-modify-with-meld-git-commit-reopen-in-emacs-m >> > -- Karl Brand Dept of Cardiology and Dept of Bioinformatics Erasmus MC Dr Molewaterplein 50 3015 GE Rotterdam T +31 (0)10 703 2460 |M +31 (0)642 777 268 |F +31 (0)10 704 4161