瀏覽代碼

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 年之前
父節點
當前提交
2bb8da0405
共有 1 個檔案被更改,包括 9 行新增9 行删除
  1. 9
    9
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java

+ 9
- 9
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java 查看文件

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


/** /**


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

Loading…
取消
儲存