[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [egit-dev] bug for egit synchronize view showing diff when there are no real diff - git status "fixes" it
|
On 7 Nov 2014, at 9:49, Alex Blewitt wrote:
You might want to look at the files in a hex viewer to compare line
endings. If something is doing a bulk replacement of \n to \r\n (or
vice versa) then the SHAs will differ. You can set up git to convert
or not with core config. I suspect that the index is being reset to
the on disk sha after status has run and that causes jgit to rebuild
its view.
shouldn't git diff also show a difference then ? (it does not)
/max
Alex
Sent from my iPhat 6
On 7 Nov 2014, at 08:23, Max Rydahl Andersen <manderse@xxxxxxxxxx>
wrote:
Hey,
I'm trying to figure out the proper fix for this issue
https://www.eclipse.org/forums/index.php/t/460751/
which is that egit synchronize view shows a tons of "conflicting
changes" when there in reality are only one change.
The reproducible test I have is as follows:
git clone https://github.com/joshuawilson/snowdrop-examples
cd snowdrop-examples
git fetch origin snowdrop-less
git co snowdrop-less
git status shows no changes.
Now import the project in eclipse and use synchronize view.
Now multiple files shows up as conflicting changes.
Why ?
Then I run 'git status' on the command a few times and voila, egit
synchronize view now shows the correct state: no changes.
Is this a known issue ? what is the git status command doing that
makes egit conform to reality ?
/max
http://about.me/maxandersen
_______________________________________________
egit-dev mailing list
egit-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or
unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/egit-dev
/max
http://about.me/maxandersen
