Merge "Remove two "Dead store to local variable" warnings"
This commit is contained in:
commit
a434172079
|
@ -517,7 +517,6 @@ void processEntry(AbstractTreeIterator h, AbstractTreeIterator m,
|
||||||
conflict(name, (i != null) ? i.getDirCacheEntry() : null, h, m);
|
conflict(name, (i != null) ? i.getDirCacheEntry() : null, h, m);
|
||||||
break;
|
break;
|
||||||
case 0xFDF: // 7 8 9
|
case 0xFDF: // 7 8 9
|
||||||
dce = i.getDirCacheEntry();
|
|
||||||
if (hId.equals(mId)) {
|
if (hId.equals(mId)) {
|
||||||
if (isModified(name))
|
if (isModified(name))
|
||||||
conflict(name, i.getDirCacheEntry(), h, m); // 8
|
conflict(name, i.getDirCacheEntry(), h, m); // 8
|
||||||
|
|
|
@ -148,7 +148,7 @@ public FileHeader(final byte[] headerLines, EditList edits, PatchType type) {
|
||||||
this(headerLines, 0);
|
this(headerLines, 0);
|
||||||
endOffset = headerLines.length;
|
endOffset = headerLines.length;
|
||||||
int ptr = parseGitFileName(Patch.DIFF_GIT.length, headerLines.length);
|
int ptr = parseGitFileName(Patch.DIFF_GIT.length, headerLines.length);
|
||||||
ptr = parseGitHeaders(ptr, headerLines.length);
|
parseGitHeaders(ptr, headerLines.length);
|
||||||
this.patchType = type;
|
this.patchType = type;
|
||||||
addHunk(new HunkHeader(this, edits));
|
addHunk(new HunkHeader(this, edits));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue