Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » [SOLVED] EGit shows (seemingly random) changes on newly checked out branch
icon6.gif  [SOLVED] EGit shows (seemingly random) changes on newly checked out branch [message #1220757] Fri, 13 December 2013 07:34 Go to next message
Stephan Druskat is currently offline Stephan Druskat
Messages: 52
Registered: October 2011
Location: Berlin, Germany
Member

I'm not very proficient in git, and have stumbled across a thing in EGit (or possibly git) that I don't understand.

I have a github remote with some pull requests merged into some branches. I'm developing solo, so I'm the only one who really works on it. Locally, when I want to develop - say - a new feature, I create and checkout a new branch. Either I use a local branch (e.g., an up-to-date master), or a remote branch to base the new branch upon (guess I should call those the "tracking branches"?).

Now I have issues with a branch: Whenever I check out this local branch, EGit shows changes on the branch even before I have done a thing. So whenever I would want to switch back to another branch, I'd have to commit or stash the changes, or reset. Reset doesn't work in most cases, sometimes it works to click reset several times.

The real problem is: I don't know where these changes come from, and they don't affect the same files every time I check out the branch. Say I switch from an unchanged master to this branch, I will see changes on files A and B, I reset and go back to master, then go to the branch again, and I will see changes on files C, D, and E. The files types of the changed files aren't coherent either, they are often a mixture of .classpath, feature.xml, plugin.xml, and Java source files (Eclipse RCP application).

Can anybody offer a guess at what I'm doing wrong, or whether this is a bug?

Many thanks!

p.s.: Kepler R1, EGit 3.0.3.201309161630-r.

[Updated on: Fri, 13 December 2013 10:50]

Report message to a moderator

Re: EGit shows (seemingly random) changes on newly checked out branch [message #1220790 is a reply to message #1220757] Fri, 13 December 2013 10:33 Go to previous messageGo to next message
Stephan Druskat is currently offline Stephan Druskat
Messages: 52
Registered: October 2011
Location: Berlin, Germany
Member

Having looked into it a bit more it seems as if a build makes the changes... Any ideas anyone?
Re: EGit shows (seemingly random) changes on newly checked out branch [message #1220797 is a reply to message #1220757] Fri, 13 December 2013 10:50 Go to previous messageGo to next message
Stephan Druskat is currently offline Stephan Druskat
Messages: 52
Registered: October 2011
Location: Berlin, Germany
Member

Found it: setting core.autocrlf to false in .gitconfig fixed it... Only cost me most of the day, grrrr.
Re: EGit shows (seemingly random) changes on newly checked out branch [message #1220869 is a reply to message #1220797] Sat, 14 December 2013 17:29 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 548
Registered: July 2009
Senior Member
You probably used autocrlf=input which suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=372834
There is a patch for this problem pending in review here https://git.eclipse.org/r/#/c/19397/
Could you try if this fixes your problem ?
Re: EGit shows (seemingly random) changes on newly checked out branch [message #1230405 is a reply to message #1220869] Sat, 11 January 2014 18:01 Go to previous message
Robin Rosenberg is currently offline Robin Rosenberg
Messages: 317
Registered: July 2009
Senior Member
Matthias Sohn skrev 2013-12-14 23.29:
> You probably used autocrlf=input which suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=372834
> There is a patch for this problem pending in review here https://git.eclipse.org/r/#/c/19397/
> Could you try if this fixes your problem ?

That version was rolled back. Another patch is at https://git.eclipse.org/r/#/c/20173/.

-- robin
Previous Topic:Egit hangs clone from repository with ssh
Next Topic:EGit over NAT
Goto Forum:
  


Current Time: Thu Jul 31 05:35:23 EDT 2014

Powered by FUDForum. Page generated in 0.02337 seconds