diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:11:06 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:11:11 +0900 |
| commit | 55b13350842c4198c1227991b5c87b19a2a9edb6 (patch) | |
| tree | 022f702683c0eb50dea2907ed62305b32b04f940 | |
| parent | e4bb6441df5bf1e99d04ef08c65c3846085cfc56 (diff) | |
| parent | a96d640365b654625b70be52454625be11da6bc3 (diff) | |
| download | jgit-55b13350842c4198c1227991b5c87b19a2a9edb6.tar.gz jgit-55b13350842c4198c1227991b5c87b19a2a9edb6.zip | |
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10:
ResolveMerger: Fix encoding with string; use bytes
Change-Id: I2f02298d0ff7caafeca4020cde4fdfa29a46e585
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| -rwxr-xr-x | 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 6462608f57..6f7a702470 100755 --- 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()); |