Re: How to avoid the ^M induced by Meld and Git
- From
- Karl Brand <k.brand@erasmusmc.nl>
- Date
- Dec 12, 2012, 16:17 UTC
- Message-ID
- <50C8AE14.4000704@erasmusmc.nl>
- In-Reply-To
- <50C8AC0A.1010306@drmicha.warpmail.net>
On 12/12/12 17:08, Michael J Gruber wrote:
Show 28 quoted lines
> Karl Brand venit, vidit, dixit 12.12.2012 16:34: >> >> >> 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... > > I didn't mean to shy you away ;)
Applying recent lessons form StackO'flow :P
Show 5 quoted lines
> > Could it be that there is a ^M very early in the file (or rather > something else which isn't covered by dos2unix) so that Meld thinks it's > DOS and inserts line endings as DOS? At least that's what vim would do. >
If there is i don't find it using Emacs, but Emacs may only show what dos2unix sees... Will post back the Meld insights (here's hoping!)
Show 26 quoted lines
> In any case, Meld people over there should know (or get to know) that > effect. > >>>> 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