diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2017-11-08 20:20:45 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2017-11-15 10:37:56 +0900 |
| commit | 6ec5d8ddb13df9ccc085434bb5598ae89395d90c (patch) | |
| tree | a1a22334db8dcd3f505f7d5c4aeb6b742f85a47a /org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java | |
| parent | 2a15a63005a2116e271efc44c39741efbfe075d4 (diff) | |
| download | jgit-6ec5d8ddb13df9ccc085434bb5598ae89395d90c.tar.gz jgit-6ec5d8ddb13df9ccc085434bb5598ae89395d90c.zip | |
TreeWalk: Make getEolStreamType(OperationType) public
and deprecate getEolStreamType().
This resolves a TODO that was apparently supposed to be done in
version 4.4.
Change-Id: I5c9861aedabdc3f99dcf47519b3959a979e6a591
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java index b56fb2519b..08fde70edd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java @@ -42,6 +42,8 @@ */ package org.eclipse.jgit.api; +import static org.eclipse.jgit.treewalk.TreeWalk.OperationType.CHECKOUT_OP; + import java.io.IOException; import java.text.MessageFormat; import java.util.HashSet; @@ -355,7 +357,8 @@ public class StashApplyCommand extends GitCommand<ObjectId> { // Not in commit, don't create untracked continue; - final EolStreamType eolStreamType = walk.getEolStreamType(); + final EolStreamType eolStreamType = walk + .getEolStreamType(CHECKOUT_OP); final DirCacheEntry entry = new DirCacheEntry(walk.getRawPath()); entry.setFileMode(cIter.getEntryFileMode()); entry.setObjectIdFromRaw(cIter.idBuffer(), cIter.idOffset()); |