aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2010-12-03 13:51:39 -0800
committerMatthias Sohn <matthias.sohn@sap.com>2010-12-05 15:42:57 +0100
commit064ecc25ceea649fb55f1a9a05bc58e8bee9a9c3 (patch)
treef3b22ae5b43df1dabc26964127f8dd0374bb356b /org.eclipse.jgit
parentc474813b0a4110a96834abc669db9f02fe941d7b (diff)
downloadjgit-064ecc25ceea649fb55f1a9a05bc58e8bee9a9c3.tar.gz
jgit-064ecc25ceea649fb55f1a9a05bc58e8bee9a9c3.zip
Fix findGitDir() with no ceiling directories
Bug: 322866 Change-Id: I64205bb0315a725dfa523ccff1796de50f465162 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> CC: Ketan Padegaonkar <KetanPadegaonkar@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
index 828cf0c511..4fa74630f3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
@@ -457,7 +457,8 @@ public class BaseRepositoryBuilder<B extends BaseRepositoryBuilder, R extends Re
}
current = current.getParentFile();
- if (current != null && ceilingDirectories.contains(current))
+ if (current != null && ceilingDirectories != null
+ && ceilingDirectories.contains(current))
break;
}
}