Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 365639

Summary:

EGit error pushing changes to origin

Product:

[Technology] EGit

Reporter:

Alessio Pollero <alessio.pollero>

Component:

Core

Assignee:

Project Inbox <egit.core-inbox>

Status:

RESOLVED FIXED

QA Contact:

Severity:

critical

Priority:

CC:

alessio.pollero, matthias.sohn, robin

Version:

unspecified

Target Milestone:

2.1-M1

Hardware:

OS:

Windows Server 2008

Whiteboard:

Attachments:

Description	Flags
Screenshot of the error	none
Error log of the issue	none

Description Alessio Pollero

2011-12-05 12:34:55 EST

Build Identifier: M20110909-1335

Pushing changes to my origin git bare repository caused an error on Egit : JGit Internal Exception.

The problem is that now after this error when i push i get "everything is up to date" but in the repository i can't find the new commits related to this push opetration, why ? 

How can i resolve that ?

In the attachment screenshot of the error and log file.

Reproducible: Didn't try

Steps to Reproduce:
1. Do some changes on the project.
2. Commit the changes on local repository
3. Pushing the changes to remote repository (bare repository) 

One file was out of synch at the moment of the push, but this files is excluded from the repository...

Comment 1 Alessio Pollero

2011-12-05 12:35:19 EST

Created attachment 207935 [details]
Screenshot of the error

Comment 2 Alessio Pollero

2011-12-05 12:36:41 EST

Created attachment 207936 [details]
Error log of the issue

Comment 3 Alessio Pollero

2011-12-05 12:42:20 EST

I had to do git merge on the last commit to succeed pushing correctly the last commit. EGit had automatically created a merge with that commit, really strange ...

Comment 4 Matthias Sohn

2011-12-06 04:41:14 EST

If you look into the error you'll see that JGit complained that there is nothing to push.
- From which local branch did you try to push ?
- To which remote branch did you intend to push?
- What was the refspec you used for pushing? The refspec is defining how to map local branches to branches in the remote repository

Comment 5 Alessio Pollero

2011-12-06 04:49:53 EST

I was in the master local branch and i tried to push as usual in the origin master .
I never created a branch in this project/repository, seems that JGit automatically created a branch after an error during the first push operation, in fact after the first error i get the : "everything was up to date", but the first error caused this behaviour.

The first error was : 

!ENTRY org.eclipse.core.resources 4 1 2011-12-05 16:43:00.456
!MESSAGE Core exception while retrieving the content description
!STACK 1
org.eclipse.core.internal.resources.ResourceException: Resource is out of sync with the file system: '/juakari2fjssco/juakari2fjssco.log'.

Comment 6 Matthias Sohn

2011-12-06 19:08:31 EST

(In reply to comment #5)
> I was in the master local branch and i tried to push as usual in the origin
> master .
> I never created a branch in this project/repository, seems that JGit
> automatically created a branch after an error during the first push operation,
> in fact after the first error i get the : "everything was up to date", but the
> first error caused this behaviour.
> 
> The first error was : 
> 
> !ENTRY org.eclipse.core.resources 4 1 2011-12-05 16:43:00.456
> !MESSAGE Core exception while retrieving the content description
> !STACK 1
> org.eclipse.core.internal.resources.ResourceException: Resource is out of sync
> with the file system: '/juakari2fjssco/juakari2fjssco.log'.

This doesn't look like an error coming from EGit, but rather like you changed some files which are in the Eclipse workspace from outside Eclipse.

I can't imagine how EGit would create a branch when push hits an error.

Please provide step by step instructions how to reproduce your problem.

Comment 7 Matthias Sohn

2011-12-06 19:09:27 EST

Which EGit version are you using ?

Comment 8 Matthias Sohn

2012-06-27 18:19:20 EDT

"nothing to push" is not a severe error, not displaying this in a result dialog is bad, this was fixed in the meantime (tried with recent EGit 2.1-SNAPSHOT)