diff options
author | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:12:14 +0900 |
---|---|---|
committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:13:27 +0900 |
commit | 6ba60a31277f129eda7858f5e21d04edba2a9a43 (patch) | |
tree | d1aba5935bcf01e6d7ef2b95e9d4656a8148c055 | |
parent | a7ea275eaf5b84a8715715b99b22f13e8cd53384 (diff) | |
parent | 55b13350842c4198c1227991b5c87b19a2a9edb6 (diff) | |
download | jgit-6ba60a31277f129eda7858f5e21d04edba2a9a43.tar.gz jgit-6ba60a31277f129eda7858f5e21d04edba2a9a43.zip |
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11:
ResolveMerger: Fix encoding with string; use bytes
Change-Id: I40b7b4b3fd6d53bbad32f8f550e885c0e698faf1
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 a908db7a13..da6a3da67d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -470,7 +470,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()); |