浏览代码

Fix two nits about DirCacheEntry constructors

Explicitly pass STAGE_0 when creating a DirCacheEntry from String.
This matches the immediate next constructor that accepts the int
stage argument better, making the code easier to read.

Fix a weird line break where the comma was orphaned by itself.

Change-Id: Icf0970dd02a63877f9e41b51b982b0265e8b8887
tags/v3.4.2.201412180340-r
Shawn Pearce 9 年前
父节点
当前提交
98c75a7ca2
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4
    4
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java

+ 4
- 4
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java 查看文件

@@ -203,7 +203,6 @@ public class DirCacheEntry {

if (mightBeRacilyClean(smudge_s, smudge_ns))
smudgeRacilyClean();

}

/**
@@ -217,7 +216,7 @@ public class DirCacheEntry {
* or DirCache file.
*/
public DirCacheEntry(final String newPath) {
this(Constants.encode(newPath));
this(Constants.encode(newPath), STAGE_0);
}

/**
@@ -269,8 +268,9 @@ public class DirCacheEntry {
if (!isValidPath(newPath))
throw new InvalidPathException(toString(newPath));
if (stage < 0 || 3 < stage)
throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidStageForPath
, stage, toString(newPath)));
throw new IllegalArgumentException(MessageFormat.format(
JGitText.get().invalidStageForPath,
stage, toString(newPath)));

info = new byte[INFO_LEN];
infoOffset = 0;

正在加载...
取消
保存