]> source.dussan.org Git - jgit.git/commit
Added dirty-detection to WorkingTreeIterator 59/1059/7
authorChristian Halstrick <christian.halstrick@sap.com>
Fri, 16 Jul 2010 08:03:49 +0000 (10:03 +0200)
committerChristian Halstrick <christian.halstrick@sap.com>
Fri, 16 Jul 2010 08:08:52 +0000 (10:08 +0200)
commitb840ed0121dfee935d503208db96639b04f7110f
tree95ea5efb675ecf76af8d17cba3f7f6d6fbc45081
parentff59ce4bff09d14a5d79dacadd75d60dee0cede9
Added dirty-detection to WorkingTreeIterator

Added possibility to compare the current entry of a WorkingTreeIterator
to a given DirCacheEntry. This is done to detect whether an entry
in the index is dirty or not. 'Dirty' means that the file in the working tree
is different from what's in the index. Merge algorithms will make use of
this to detect conflicts.

Change-Id: I3ff847f4bf392553dcbd6ee236c6ca32a13eedeb
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java