Browse Source

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
stable-3.4
Shawn Pearce 10 years ago committed by Shawn Pearce
parent
commit
98c75a7ca2
  1. 8
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java

8
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java vendored

@ -203,7 +203,6 @@ public class DirCacheEntry {
if (mightBeRacilyClean(smudge_s, smudge_ns)) if (mightBeRacilyClean(smudge_s, smudge_ns))
smudgeRacilyClean(); smudgeRacilyClean();
} }
/** /**
@ -217,7 +216,7 @@ public class DirCacheEntry {
* or DirCache file. * or DirCache file.
*/ */
public DirCacheEntry(final String newPath) { 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)) if (!isValidPath(newPath))
throw new InvalidPathException(toString(newPath)); throw new InvalidPathException(toString(newPath));
if (stage < 0 || 3 < stage) if (stage < 0 || 3 < stage)
throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidStageForPath throw new IllegalArgumentException(MessageFormat.format(
, stage, toString(newPath))); JGitText.get().invalidStageForPath,
stage, toString(newPath)));
info = new byte[INFO_LEN]; info = new byte[INFO_LEN];
infoOffset = 0; infoOffset = 0;

Loading…
Cancel
Save