From 76b98230055444b0baded4ff1aa87da3b77e2b45 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 11 Sep 2009 12:35:23 -0700 Subject: [PATCH] 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 --- .../src/org/eclipse/jgit/dircache/DirCacheBuildIterator.java | 4 ++-- 1 file 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 ce1d0638b..181192d14 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 * Copyright (C) 2008, Shawn O. Pearce * and other copyright owners as documented in the project's IP log. @@ -119,7 +119,7 @@ public void skip() throws CorruptObjectException { if (currentSubtree != null) builder.keep(ptr, currentSubtree.getEntrySpan()); else - builder.add(currentEntry); + builder.keep(ptr, 1); next(1); }