Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

egit and git unstaged files show different status

Tags:

git

git-svn

egit

i use git svn fetch svn repo,and do clone->branch->rebase->merge->dcommit step.with eclipse egit and cygwin client,do some days developing all is ok.

but one day ,after a merge/dcommit step,i found eclipse egit stage view status is different from git status in cygwin command line.when some files unstaged changes in eclipse,cygwin 'git status' show nothing changes;if commit with egit in elcipse,the cygwin command 'git status' show the unstaged files changed that what just commited with egit.and if commit changes with cygiwn git client,egit show the same staged files changed.the problom files is always some files.

i've use blow method,but useless git reset --hard. reclone the svn repo .importing new cloned repo from svn to eclipse project,it show the file changed at start,and always those files.

anybody help!!

like image 916
sting Avatar asked Nov 04 '22 12:11

sting


1 Answers

Total shot in the dark, but: do you have a symlink in one part of your repo, pointing to another part of it? I have that problem, and it confuses eclipse (but does not confuse the command-line git).

Eclipse, Egit and Symlinks or symbolic links - Is it possible to make a dirty eclipse plugin to fix this?

like image 144
lgdean Avatar answered Nov 09 '22 06:11

lgdean