diff options
| author | David Pursehouse | 2018-07-04 05:08:56 +0000 |
|---|---|---|
| committer | David Pursehouse | 2018-07-04 05:09:01 +0000 |
| commit | c296342333ab43596452ea040fb608f613a3e4b8 (patch) | |
| tree | 9c8b3955096ce9dc71ca2a24a873a15272e931dc | |
| parent | f5b25bcad344b12fd0cb87b72a98d6e07d65833d (diff) | |
| parent | 1dcb0688c7c229501e6a486c03ffe251d5ed2761 (diff) | |
| download | jgit-c296342333ab43596452ea040fb608f613a3e4b8.tar.gz jgit-c296342333ab43596452ea040fb608f613a3e4b8.tar.xz jgit-c296342333ab43596452ea040fb608f613a3e4b8.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
ResolveMerger: Fix encoding with string; use bytes
Change-Id: If17328fbd101d596a8a16d9c4a190e9b6e120902
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 1aac352d74..86003e9243 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -418,7 +418,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()); |