diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-01-20 21:51:09 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-01-21 00:54:15 +0100 |
| commit | c821054316e81842a801697a2ff798fb863ac646 (patch) | |
| tree | 31d3412b9bfa354f2f94a2741893b8c2c044828c /org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java | |
| parent | 6c847b30c0e81e44374fc0d00a235560620de5ce (diff) | |
| download | jgit-c821054316e81842a801697a2ff798fb863ac646.tar.gz jgit-c821054316e81842a801697a2ff798fb863ac646.zip | |
pgm: Fix missing braces in MergeBase.run()
Change-Id: I625053ceb5a81bc0014f7cab0f9fb5e5deaacc36
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java | 6 |
1 files 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 22d33582f5..60b174376b 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) { |