Browse Source

Use keep(1) instead of add() when skipping an entry

Doing a keep call with a length of 1 will copy the current entry just
like the previous add was doing, but it avoids doing any validation
on the entry.  This is sane because the entry can be assumed to be
already valid, since its originating from the destination index.

Change-Id: I250d902fc98580444af1ba4b8fedceb654541451
Originally: http://thread.gmane.org/gmane.comp.version-control.git/128214/focus=128213
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
stable-0.7
Shawn O. Pearce 15 years ago
parent
commit
76b9823005
  1. 4
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuildIterator.java

4
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuildIterator.java vendored

@ -1,5 +1,5 @@
/*
* Copyright (C) 2008, Google Inc.
* Copyright (C) 2008-2009, Google Inc.
* Copyright (C) 2009, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
* and other copyright owners as documented in the project's IP log.
@ -119,7 +119,7 @@ public class DirCacheBuildIterator extends DirCacheIterator {
if (currentSubtree != null)
builder.keep(ptr, currentSubtree.getEntrySpan());
else
builder.add(currentEntry);
builder.keep(ptr, 1);
next(1);
}

Loading…
Cancel
Save