Browse Source

pgm: Fix missing braces in MergeBase.run()

Change-Id: I625053ceb5a81bc0014f7cab0f9fb5e5deaacc36
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-5.4
Matthias Sohn 6 years ago
parent
commit
c821054316
  1. 6
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java

@ -70,14 +70,16 @@ class MergeBase extends TextBuiltin {
@Override @Override
protected void run() { protected void run() {
try { try {
for (RevCommit c : commits) for (RevCommit c : commits) {
argWalk.markStart(c); argWalk.markStart(c);
}
argWalk.setRevFilter(RevFilter.MERGE_BASE); argWalk.setRevFilter(RevFilter.MERGE_BASE);
int max = all ? Integer.MAX_VALUE : 1; int max = all ? Integer.MAX_VALUE : 1;
while (max-- > 0) { while (max-- > 0) {
final RevCommit b = argWalk.next(); final RevCommit b = argWalk.next();
if (b == null) if (b == null) {
break; break;
}
outw.println(b.getId().name()); outw.println(b.getId().name());
} }
} catch (IOException e) { } catch (IOException e) {

Loading…
Cancel
Save