motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Robin Rosenberg 2011-09-03 23:55:11 +02:00
parent b09d21b6eb
commit 2bb8da0405
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
View File

@ -624,7 +624,7 @@ void processEntry(AbstractTreeIterator h, AbstractTreeIterator m,
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 @@ else if (m == null)
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 @@ else if (m == null)
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);
}
}
}