From: Marek Zawirski Date: Thu, 28 Aug 2008 02:32:48 GMT Subject: [JGIT PATCH 2/3] Add another delete method in RefUpdate, reusing RevWalk Message-ID: <1219890769-20119-3-git-send-email-marek.zawirski@gmail.com> In-Reply-To: <1219890769-20119-2-git-send-email-marek.zawirski@gmail.com> This is similar to update() approach when caller has possiblity to choose between providing RevWalk instance on its own or let RefUpdate create one. Signed-off-by: Marek Zawirski --- .../src/org/spearce/jgit/lib/RefUpdate.java | 22 ++++++++++++++++++- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RefUpdate.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RefUpdate.java index c6536e3..e9c0e77 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/RefUpdate.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RefUpdate.java @@ -325,11 +325,30 @@ public Result update(final RevWalk walk) throws IOException { /** * Delete the ref. + *

+ * This is the same as: + * + * 

+	 * return delete(new RevWalk(repository));
+	 *
* * @return the result status of the delete. * @throws IOException */ public Result delete() throws IOException { + return delete(new RevWalk(db.getRepository())); + } + + /** + * Delete the ref. + * + * @param walk + * a RevWalk instance this delete command can borrow to perform + * the merge test. The walk will be reset to perform the test. + * @return the result status of the delete. + * @throws IOException + */ + public Result delete(final RevWalk walk) throws IOException { if (name.startsWith(Constants.R_HEADS)) { final Ref head = db.readRef(Constants.HEAD); if (head != null && name.equals(head.getName())) @@ -337,8 +356,7 @@ public Result delete() throws IOException { } try { - return updateImpl(new RevWalk(db.getRepository()), - new DeleteStore()); + return updateImpl(walk, new DeleteStore()); } catch (IOException x) { result = Result.IO_FAILURE; throw x; -- 1.5.6.3