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

Bug 365778

Summary:	Egit modified permissions of unmodified files in the repo
Product:	[Technology] EGit	Reporter:	Ayushman Jain <amj87.iitr>
Component:	Core	Assignee:	Project Inbox <egit.core-inbox>
Status:	NEW ---	QA Contact:
Severity:	normal
Priority:	P3	CC:	angvoz.dev, daniel_megert, markus.kell.r, robin.rosenberg, satyam.kandula, srikanth_sankaran, stephan.herrmann
Version:	1.1
Target Milestone:	---
Hardware:	PC
OS:	All
Whiteboard:

Description Ayushman Jain

2011-12-06 12:30:17 EST

Build id: 1.1.0.201109151100-r

core.filemode = false

Here's the scenario:
1) 2 branches - integration and master of the platform.common repo
2) integration is ahead of master by 1 commit.
3) i released something in master.
4) Checked out integration and merged master into integration.
5) Only 1 project of the repo is in workspace - jdt.doc.isv
6) Surprisingly during the merge, permissions of html files in other projects - pde.doc and platform.ui.doc got automatically changed.
7) Post this, egit rejected every push or merge to/into integration.
8) Git command line allows merge
9) However git diff origin/master always shows those changed permissions. Reverting or resetting does not affect these zombie files.

Solution was:
1) Import all projects of repo into your workspace.
2) Hard reset to some sane commit.
3) Now merge both branches.

Egit has no business to change files i haven't touched and not even imported in my workspace. This was a big time sink. :(

Known issue?

Comment 1 Ayushman Jain

2011-12-07 03:30:35 EST

I found these in my log (timestamp seems to be around the same time I did the 'faulty' merge).

!ENTRY org.eclipse.egit.ui 4 0 2011-12-06 11:27:39.737
!MESSAGE Merge of revisions c077b970c335734d190bccfedeed78780da188cc, 6b856193133b4ecd667ef02366c559974e525315 with base 17a33e21f64db9b8223663d78ab0feb0417eade7 using strategy resolve resulted in: Failed. 

!ENTRY org.eclipse.team.core 4 0 2011-12-06 11:27:39.740
!MESSAGE Merge of revisions c077b970c335734d190bccfedeed78780da188cc, 6b856193133b4ecd667ef02366c559974e525315 with base 17a33e21f64db9b8223663d78ab0feb0417eade7 using strategy resolve resulted in: Failed. 

!ENTRY org.eclipse.egit.ui 4 0 2011-12-06 11:35:54.973
!MESSAGE Committing failed
!STACK 1
org.eclipse.team.core.TeamException: An internal error occurred
	at org.eclipse.egit.core.op.CommitOperation.commit(CommitOperation.java:278)
	at org.eclipse.egit.core.op.CommitOperation.access$7(CommitOperation.java:245)
	at org.eclipse.egit.core.op.CommitOperation$1.run(CommitOperation.java:209)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2326)
	at org.eclipse.egit.core.op.CommitOperation.execute(CommitOperation.java:219)
	at org.eclipse.egit.ui.internal.commit.CommitUI$2.run(CommitUI.java:221)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: org.eclipse.jgit.api.errors.JGitInternalException: No changes
	at org.eclipse.jgit.api.CommitCommand.createTemporaryIndex(CommitCommand.java:414)
	at org.eclipse.jgit.api.CommitCommand.call(CommitCommand.java:193)
	at org.eclipse.egit.core.op.CommitOperation.commit(CommitOperation.java:267)
	... 7 more
!SUBENTRY 1 org.eclipse.team.core 4 0 2011-12-06 11:35:54.974
!MESSAGE An internal error occurred
!STACK 0
org.eclipse.jgit.api.errors.JGitInternalException: No changes
	at org.eclipse.jgit.api.CommitCommand.createTemporaryIndex(CommitCommand.java:414)
	at org.eclipse.jgit.api.CommitCommand.call(CommitCommand.java:193)
	at org.eclipse.egit.core.op.CommitOperation.commit(CommitOperation.java:267)
	at org.eclipse.egit.core.op.CommitOperation.access$7(CommitOperation.java:245)
	at org.eclipse.egit.core.op.CommitOperation$1.run(CommitOperation.java:209)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2326)
	at org.eclipse.egit.core.op.CommitOperation.execute(CommitOperation.java:219)
	at org.eclipse.egit.ui.internal.commit.CommitUI$2.run(CommitUI.java:221)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)

Comment 2 Robin Rosenberg

2013-01-03 19:44:34 EST

Is this still an issue?