From 64e3e5c6b012223d403784b66e6958e27e6ab70e Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Tue, 25 Nov 2008 00:45:48 +0100 Subject: [PATCH] Avoid breaking a path-limited revision walk prematurely This optimization broke the walk when all changes were adds, assuming the parent was an empty tree. This assumption was wrong. The tree does not have to be empty, it can contain other trees and blobs outside of the set matched by the TreeFilter. http://code.google.com/p/egit/issues/detail?id=46 Signed-off-by: Robin Rosenberg Signed-off-by: Shawn O. Pearce --- .../src/org/spearce/jgit/revwalk/RewriteTreeFilter.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/revwalk/RewriteTreeFilter.java b/org.spearce.jgit/src/org/spearce/jgit/revwalk/RewriteTreeFilter.java index 587d6d21..a5edbf00 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/revwalk/RewriteTreeFilter.java +++ b/org.spearce.jgit/src/org/spearce/jgit/revwalk/RewriteTreeFilter.java @@ -118,13 +118,6 @@ class RewriteTreeFilter extends RevFilter { // c.flags |= REWRITE; return false; - } else if (chgs == adds) { - // We added everything, so the parent may as well just - // be an empty tree. Kill our parent, we can assume - // it did not supply interesting changes. - // - c.parents = RevCommit.NO_PARENTS; - return true; } else { // We have interesting items, but neither of the special // cases denoted above. -- 2.11.4.GIT