Browse Source

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

stable-0.10
Shawn Pearce 14 years ago committed by Code Review
parent
commit
a434172079
  1. 1
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
  2. 2
      org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java

1
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java vendored

@ -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

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

@ -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));
}

Loading…
Cancel
Save