diff options
| author | Stefan Lay | 2010-09-09 09:39:04 +0000 |
|---|---|---|
| committer | Code Review | 2010-09-09 09:39:04 +0000 |
| commit | d3fb8b9e27337fd371fdc1c39c47a8141e990183 (patch) | |
| tree | 579ddae59be8cc91416b0df3118303b3d1666392 /org.eclipse.egit.ui | |
| parent | dada434d32fdd325013f0545a1dc36a39cbfe1d6 (diff) | |
| parent | 73b128b4c87e663ede8000cb81529655bf17a8c4 (diff) | |
| download | egit-d3fb8b9e27337fd371fdc1c39c47a8141e990183.tar.gz egit-d3fb8b9e27337fd371fdc1c39c47a8141e990183.tar.xz egit-d3fb8b9e27337fd371fdc1c39c47a8141e990183.zip | |
Merge "ChangeSet implementation shouldn't be aware of .gitignore"
Diffstat (limited to 'org.eclipse.egit.ui')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObject.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObject.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObject.java index 99a34442a7..98854fe3af 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObject.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelObject.java @@ -19,10 +19,7 @@ import org.eclipse.egit.core.synchronize.dto.GitSynchronizeData; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.treewalk.TreeWalk; -import org.eclipse.jgit.treewalk.filter.AndTreeFilter; -import org.eclipse.jgit.treewalk.filter.NotIgnoredFilter; /** * Abstract representation of all object that are included in Git ChangeSet @@ -120,10 +117,8 @@ public abstract class GitModelObject extends PlatformObject { tw.reset(); tw.setRecursive(false); - int ignoreNth = tw.addTree(new FileTreeIterator(repo)); - NotIgnoredFilter notIgnoredFilter = new NotIgnoredFilter(ignoreNth); - tw.setFilter(AndTreeFilter.create(ANY_DIFF, notIgnoredFilter)); + tw.setFilter(ANY_DIFF); return tw; } |