diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:09:48 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:09:53 +0900 |
| commit | b6a6ba10c7670dbece318811eb1c46aa07988006 (patch) | |
| tree | ea671979bd1588a2fca4a6cbef2ad5310c4ec7e0 | |
| parent | 555790b59e0072891255f7de8edb36335fb79d30 (diff) | |
| parent | c296342333ab43596452ea040fb608f613a3e4b8 (diff) | |
| download | jgit-b6a6ba10c7670dbece318811eb1c46aa07988006.tar.gz jgit-b6a6ba10c7670dbece318811eb1c46aa07988006.zip | |
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8:
ResolveMerger: Fix encoding with string; use bytes
Change-Id: Id6a85804695d5dcb32f26ed1d861b7c93577c5e4
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 23fdc35bd0..246121bf3a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -434,7 +434,7 @@ public class ResolveMerger extends ThreeWayMerger { * @return the entry which was added to the index */ private DirCacheEntry keep(DirCacheEntry e) { - DirCacheEntry newEntry = new DirCacheEntry(e.getPathString(), + DirCacheEntry newEntry = new DirCacheEntry(e.getRawPath(), e.getStage()); newEntry.setFileMode(e.getFileMode()); newEntry.setObjectId(e.getObjectId()); |