Merge branch 'stable-4.11' into stable-5.0
* stable-4.11: ResolveMerger: Fix encoding with string; use bytes Change-Id: I40b7b4b3fd6d53bbad32f8f550e885c0e698faf1 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
commit
6ba60a3127
|
@ -470,7 +470,7 @@ private DirCacheEntry add(byte[] path, CanonicalTreeParser p, int stage,
|
||||||
* @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…
Reference in New Issue