summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorRobin Stocker2010-10-29 08:32:55 (EDT)
committer Robin Stocker2010-10-29 08:37:42 (EDT)
commit3f78650c9af941634022f4f8422e51cab40ca85f (patch)
treebc8f84599d3381ddfe8ce1ec88ab780303795320
parent7f939ba86e4c4ce379b4dc62045109a91e97dd72 (diff)
downloadjgit-3f78650c9af941634022f4f8422e51cab40ca85f.zip
jgit-3f78650c9af941634022f4f8422e51cab40ca85f.tar.gz
jgit-3f78650c9af941634022f4f8422e51cab40ca85f.tar.bz2
Remove two "Dead store to local variable" warningsrefs/changes/18/1818/1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
index f521504..c7b9eb5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
@@ -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
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java
index eae1040..9693c74 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java
+++ b/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));
}