Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 362319 - Git Staging view shows excluded resources as unstaged changes
Summary: Git Staging view shows excluded resources as unstaged changes
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 1.2   Edit
Hardware: PC Windows 7
: P3 minor (vote)
Target Milestone: 1.2-M2   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-28 10:24 EDT by Markus Keller CLA
Modified: 2011-11-12 03:49 EST (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Markus Keller CLA 2011-10-28 10:24:15 EDT 
The Git Staging view shows excluded resources as unstaged changes (deleted files). "$ git status" doesn't care about excluded resources, so EGit also shouldn't show them as deleted.

If one of the excluded resources is modified, then EGit should consider it as modified (since an external git command would also include it).

Example:
- clone git://git.eclipse.org/gitroot/platform/eclipse.platform.swt.git
- import project eclipse.platform.swt\examples\org.eclipse.swt.snippets
- add this to the .project file's <projectDescription> element:
	<filteredResources>
		<filter>
			<id>1319807984358</id>
			<name>src/org/eclipse/swt/snippets</name>
			<type>6</type>
			<matcher>
				<id>org.eclipse.ui.ide.multiFilter</id>
				<arguments>1.0-name-matches-false-true-Snippet(?:158|17[48]|195|209|267|277|306|32[139]|34[18]|352)\.java</arguments>
			</matcher>
		</filter>
	</filteredResources>
Comment 1 Remy Suen CLA 2011-10-28 17:31:47 EDT 
Markus, can you think of any scenario where we would want to deviate and follow the Eclipse workspace model? The reason this doesn't work right now is because we're calling IContainer's members(int) method that doesn't return the filtered resources.
Comment 2 Markus Keller CLA 2011-10-29 15:16:01 EDT 
> Markus, can you think of any scenario where we would want to deviate and follow
> the Eclipse workspace model?

No, I think any deviation from the command line Git is calling for trouble (bug 359052 is a similar example).
Comment 3 Remy Suen CLA 2011-10-30 12:02:56 EDT 
A change set has been pushed to Gerrit for review.
http://egit.eclipse.org/r/#change,4442

Thank you for the bug report, Markus.
Comment 4 Matthias Sohn CLA 2011-11-12 03:49:13 EST 
merged as d06b00ff457eb2f935340b4d7b582329a39dc994