diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:10:24 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:10:29 +0900 |
| commit | a96d640365b654625b70be52454625be11da6bc3 (patch) | |
| tree | fe87481ba20a169ec22f6bb732c46c60ae03eb86 /org.eclipse.jgit | |
| parent | 4770f076af1cb453595800bc2984b9ceac7d69a1 (diff) | |
| parent | b6a6ba10c7670dbece318811eb1c46aa07988006 (diff) | |
| download | jgit-a96d640365b654625b70be52454625be11da6bc3.tar.gz jgit-a96d640365b654625b70be52454625be11da6bc3.zip | |
Merge branch 'stable-4.9' into stable-4.10
* stable-4.9:
ResolveMerger: Fix encoding with string; use bytes
Change-Id: Ibd8f2a041b0de6e008a1ea84b92823f8cbc6e3d2
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit')
| -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 5646529ddc..6d43f09c98 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -449,7 +449,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()); |