Browse Source

cleanup: Reuse local variable for current DirCacheEntry

Since we already have assigned i.getDirCacheEntry() to dce,
use dce instead.

Change-Id: I107713ad0b356516d75c29203f945b056bad3ac7
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
tags/v1.1.0.201109151100-r
Robin Rosenberg 12 years ago
parent
commit
2bb8da0405

+ 9
- 9
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java View File

@@ -624,7 +624,7 @@ public class DirCacheCheckout {
if (hId.equals(iId)) {
dce = i.getDirCacheEntry();
if (f == null || f.isModified(dce, true))
conflict(name, i.getDirCacheEntry(), h, m);
conflict(name, dce, h, m);
else
remove(name);
} else
@@ -700,13 +700,13 @@ public class DirCacheCheckout {
if (m==null && walk.isDirectoryFileConflict()) {
if (dce != null
&& (f == null || f.isModified(dce, true)))
conflict(name, i.getDirCacheEntry(), h, m);
conflict(name, dce, h, m);
else
remove(name);
} else
keep(i.getDirCacheEntry());
keep(dce);
} else
conflict(name, i.getDirCacheEntry(), h, m);
conflict(name, dce, h, m);
} else if (m == null) {

/**
@@ -722,21 +722,21 @@ public class DirCacheCheckout {

if (hId.equals(iId)) {
if (f == null || f.isModified(dce, true))
conflict(name, i.getDirCacheEntry(), h, m);
conflict(name, dce, h, m);
else
remove(name);
} else
conflict(name, i.getDirCacheEntry(), h, m);
conflict(name, dce, h, m);
} else {
if (!hId.equals(mId) && !hId.equals(iId) && !mId.equals(iId))
conflict(name, i.getDirCacheEntry(), h, m);
conflict(name, dce, h, m);
else if (hId.equals(iId) && !mId.equals(iId)) {
if (dce != null && (f == null || f.isModified(dce, true)))
conflict(name, i.getDirCacheEntry(), h, m);
conflict(name, dce, h, m);
else
update(name, mId, m.getEntryFileMode());
} else {
keep(i.getDirCacheEntry());
keep(dce);
}
}
}

Loading…
Cancel
Save