motiejus
/
jgit
1
Fork 0
Code Releases Activity

DirCacheCheckout: don't use deprecated method 

Pass the CheckoutMetadata to checkoutEntry(), otherwise cr-lf settings
and smudge filters would be ignored.

Change-Id: Ifb1c4cb098a0b47c9752d0231d530db6a92b25a4
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
Thomas Wolf 2019-11-03 10:14:40 +01:00
parent 64f2407f19
commit e8c3619063
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
View File

@ -1243,9 +1243,12 @@ private void keep(String path, DirCacheEntry e, WorkingTreeIterator f)
if (e != null && !FileMode.TREE.equals(e.getFileMode()))
builder.add(e);
if (force) {
if (f.isModified(e, true, this.walk.getObjectReader())) {
if (f.isModified(e, true, walk.getObjectReader())) {
kept.add(path);
checkoutEntry(repo, e, this.walk.getObjectReader());
checkoutEntry(repo, e, walk.getObjectReader(), false,
new CheckoutMetadata(walk.getEolStreamType(CHECKOUT_OP),
walk.getFilterCommand(
Constants.ATTR_FILTER_TYPE_SMUDGE)));
}
}
}