From c821054316e81842a801697a2ff798fb863ac646 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 20 Jan 2019 21:51:09 +0100 Subject: [PATCH] pgm: Fix missing braces in MergeBase.run() Change-Id: I625053ceb5a81bc0014f7cab0f9fb5e5deaacc36 Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/pgm/MergeBase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java index 22d33582f..60b174376 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java @@ -70,14 +70,16 @@ class MergeBase extends TextBuiltin { @Override protected void run() { try { - for (RevCommit c : commits) + for (RevCommit c : commits) { argWalk.markStart(c); + } argWalk.setRevFilter(RevFilter.MERGE_BASE); int max = all ? Integer.MAX_VALUE : 1; while (max-- > 0) { final RevCommit b = argWalk.next(); - if (b == null) + if (b == null) { break; + } outw.println(b.getId().name()); } } catch (IOException e) {