Browse Source

Merge branch 'stable-5.0'

* stable-5.0:
  ResolveMerger: Fix encoding with string; use bytes

Change-Id: I8e6d0c92144db3bf57ea05f93852ac015458260b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-5.1
David Pursehouse 6 years ago
parent
commit
67f7ca5bb6
  1. 2
      org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java

2
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 * @return the entry which was added to the index
*/ */
private DirCacheEntry keep(DirCacheEntry e) { private DirCacheEntry keep(DirCacheEntry e) {
DirCacheEntry newEntry = new DirCacheEntry(e.getPathString(), DirCacheEntry newEntry = new DirCacheEntry(e.getRawPath(),
e.getStage()); e.getStage());
newEntry.setFileMode(e.getFileMode()); newEntry.setFileMode(e.getFileMode());
newEntry.setObjectId(e.getObjectId()); newEntry.setObjectId(e.getObjectId());

Loading…
Cancel
Save