Change-Id: I950de82db15c4610dc5a94f304279971daef971e
@ -517,7 +517,6 @@ public class DirCacheCheckout {
conflict(name, (i != null) ? i.getDirCacheEntry() : null, h, m);
break;
case 0xFDF: // 7 8 9
dce = i.getDirCacheEntry();
if (hId.equals(mId)) {
if (isModified(name))
conflict(name, i.getDirCacheEntry(), h, m); // 8
@ -148,7 +148,7 @@ public class FileHeader extends DiffEntry {
this(headerLines, 0);
endOffset = headerLines.length;
int ptr = parseGitFileName(Patch.DIFF_GIT.length, headerLines.length);
ptr = parseGitHeaders(ptr, headerLines.length);
parseGitHeaders(ptr, headerLines.length);
this.patchType = type;
addHunk(new HunkHeader(this, edits));
}