diff options
| author | Shawn Pearce <spearce@spearce.org> | 2010-10-29 10:49:45 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-10-29 10:49:45 -0400 |
| commit | a4341720798c2e68f9a1c2230c35d120e121a2e5 (patch) | |
| tree | 8df3d89b2386a9e95702436f1f7e3a2f83ac9653 | |
| parent | 1572c9f4a79a71cb74d20d3066dc982a3033a1e8 (diff) | |
| parent | 3f78650c9af941634022f4f8422e51cab40ca85f (diff) | |
| download | jgit-a4341720798c2e68f9a1c2230c35d120e121a2e5.tar.gz jgit-a4341720798c2e68f9a1c2230c35d120e121a2e5.zip | |
Merge "Remove two "Dead store to local variable" warnings"
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java | 2 |
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 f52150457d..c7b9eb5db0 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 eae1040f09..9693c74e24 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)); } |