diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2009-09-11 12:35:23 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-02-03 19:58:20 -0800 |
| commit | 76b98230055444b0baded4ff1aa87da3b77e2b45 (patch) | |
| tree | bb7e3a50a216de424ff3fb491abdcb7e4fc5bfa4 | |
| parent | 29b8fa84e680ce090ed355afd6052c4be9137a0c (diff) | |
| download | jgit-76b98230055444b0baded4ff1aa87da3b77e2b45.tar.gz jgit-76b98230055444b0baded4ff1aa87da3b77e2b45.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuildIterator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuildIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuildIterator.java index ce1d0638b2..181192d141 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuildIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuildIterator.java @@ -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); } |