[PATCH 1/2] Allow monitor/unintersting objects to be null
From: Alex Blewitt <hidden>
Date: 2016-06-15 22:46:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- .../src/org/spearce/jgit/lib/PackWriter.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java
index ea63942..3d7004d 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PackWriter.java@@ -230,8 +230,8 @@ public PackWriter(final Repository repo, final ProgressMonitor monitor) { public PackWriter(final Repository repo, final ProgressMonitor imonitor, final ProgressMonitor wmonitor) { this.db = repo; - initMonitor = imonitor; - writeMonitor = wmonitor; + initMonitor = (imonitor == null ? new NullProgressMonitor() : imonitor); + writeMonitor = (wmonitor == null ? new NullProgressMonitor() : wmonitor); this.deflater = new Deflater(db.getConfig().getCore().getCompression()); outputVersion = repo.getConfig().getCore().getPackIndexVersion(); }
@@ -829,6 +829,7 @@ private ObjectWalk setUpWalker( RevObject o = walker.parseAny(id); walker.markStart(o); } + if (uninterestingObjects != null) for (ObjectId id : uninterestingObjects) { final RevObject o; try {
--
1.6.2.2