motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Remove two "Dead store to local variable" warnings"

This commit is contained in:
Shawn Pearce 2010-10-29 10:49:45 -04:00 committed by Code Review
parent 1572c9f4a7 3f78650c9a
commit a434172079
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
View File

@ -517,7 +517,6 @@ void processEntry(AbstractTreeIterator h, AbstractTreeIterator m,
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

2
org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java
View File

@ -148,7 +148,7 @@ public FileHeader(final byte[] headerLines, EditList edits, PatchType type) {
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));
}