Re: [mdt-papyrus.dev] The .gitattributes file and line-ending conversion

[Quentin Le Menez <quentin.lemenez@xxxxxxxxx>]

Hi again,

It seems that my problem resided in the fact that I forgot to set the Unix formatting in my new eclipse installation... setting the correct parameters (as well as setting the core.autocrlf to false) seem to bring me back to the correct git behavior.

I will verify that it will not break again in the next few days and update the wiki (if it was not already mentioned) with the necessary information on how to do it.

Quentin

2016-02-25 9:47 GMT+01:00 Quentin Le Menez <quentin.lemenez@xxxxxxxxx>:

Hi,

Same here I use the command lines (via cygwin as well), but I admit I recently had some problems with those pesky line endings (the --checkout, reset, and stash that basically did nothing or close to it) ...
If you have the authorization however I would like it of you can push the "correct" line endings so as to avoid me some annoying, albeit not that time consuming, commands (such as editing the config core) to return the repo to its former clean glory ^^

Thanks,

Quentin

2016-02-25 9:05 GMT+01:00 MAGGI Benoit <Benoit.MAGGI@xxxxxx>:

Hi Christian,

 

You suppose wrong J,

I use command-line (on Cygwin) for a lot of git manipulations and other committers are also using the command line daily.

Basically only commit and push  are working fast enough in Egit for the Papyrus core repository, so I use command line for other operations.

I didn’t get any problems but I usually try to work on small patchset

 

I suppose that since you are the one making the biggest refactoring, you are the one that is really impacted.

 

In short: I would prefer to keep this .gitattribute and change all the files

(since at the end the goal is to stop having EOL problems)

ð  No problem for me if you want to push a big conversion commit.

ð  You can add this script [1] in Papyrus gerrit  if you want to check all line ending

 

Regards,

Benoit

1 : https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml-gerrit/configure

 

De : mdt-papyrus.dev-bounces@xxxxxxxxxxx [mailto:mdt-papyrus.dev-bounces@xxxxxxxxxxx] De la part de Christian Damus
Envoyé : jeudi 25 février 2016 04:33
À : Papyrus Project list <mdt-papyrus.dev@xxxxxxxxxxx>
Objet : [mdt-papyrus.dev] The .gitattributes file and line-ending conversion

 

Hi, again,

 

(busy night here in Ottawa, it would seem)

 

Some weeks ago, the Papyrus git repo acquired a .gitattributes file that sets automatic CRLF conversion for all text files in the repository.  In theory, this is a good thing.  But, so far, EGit/JGit does not recognize this file and its CRLF configuration.  I suppose that most Papyrus developers (all but me?) use EGit exclusively for version control operations, or else are on a platform where the whitespace conversion has no impact.

 

On my Mac system, I have 15800 files that git (the command-line tool) requires me to commit to convert line endings.  Because I am not certain that I should do this conversion, I cannot use the command-line or GUI tools such as Tower or GitUp to perform rebases and other complex operations, but must use EGit which on such operations scales very badly for workspaces like Papyrus that comprise several hundred projects.

 

Does anybody know of a good reason why I should not commit these 15800 line-ending conversion and push them to the central git repository so that everybody may now see text file line endings and I may actually use the git command-line again?  Or should we remove the .gitattributes file, since it has no effect on EGit anyways?

 

Thanks,

 

Christian

_______________________________________________
mdt-papyrus.dev mailing list
mdt-papyrus.dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/mdt-papyrus.dev