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>
This commit is contained in:
commit
55b1335084
|
@ -470,7 +470,7 @@ private DirCacheEntry add(byte[] path, CanonicalTreeParser p, int stage,
|
|||
* @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());
|
||||
|
|
Loading…
Reference in New Issue