Bläddra i källkod

Do not perform character translation on copies in patches

Translation is unnecessary and risks damaging the file. Also
ensure that we close the file if an I/O error occurs.

Change-Id: Ieae6eb941fdeaa61f2611f4cd14dd39117aa12f9
tags/v2.3.0.201302130906
Robin Rosenberg 11 år sedan
förälder
incheckning
92893d1f92
1 ändrade filer med 8 tillägg och 3 borttagningar
  1. 8
    3
      org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java

+ 8
- 3
org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java Visa fil

@@ -43,6 +43,7 @@
package org.eclipse.jgit.api;

import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
@@ -147,10 +148,14 @@ public class ApplyCommand extends GitCommand<ApplyResult> {
case COPY:
f = getFile(fh.getOldPath(), false);
byte[] bs = IO.readFully(f);
FileWriter fw = new FileWriter(getFile(fh.getNewPath(),
FileOutputStream fos = new FileOutputStream(getFile(
fh.getNewPath(),
true));
fw.write(new String(bs));
fw.close();
try {
fos.write(bs);
} finally {
fos.close();
}
}
r.addUpdatedFile(f);
}

Laddar…
Avbryt
Spara