From 3f78650c9af941634022f4f8422e51cab40ca85f Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Fri, 29 Oct 2010 14:32:55 +0200 Subject: [PATCH] Remove two "Dead store to local variable" warnings Change-Id: I950de82db15c4610dc5a94f304279971daef971e --- .../src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 1 - org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java | 2 +- 2 files changed, 1 insertion(+), 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 f52150457..c7b9eb5db 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 @@ 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 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 eae1040f0..9693c74e2 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 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)); }