|
|
@@ -44,6 +44,7 @@ |
|
|
|
|
|
|
|
package org.eclipse.jgit.pgm; |
|
|
|
|
|
|
|
import java.io.IOException; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
@@ -67,16 +68,20 @@ class MergeBase extends TextBuiltin { |
|
|
|
|
|
|
|
/** {@inheritDoc} */ |
|
|
|
@Override |
|
|
|
protected void run() throws Exception { |
|
|
|
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) |
|
|
|
break; |
|
|
|
outw.println(b.getId().name()); |
|
|
|
protected void run() { |
|
|
|
try { |
|
|
|
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) |
|
|
|
break; |
|
|
|
outw.println(b.getId().name()); |
|
|
|
} |
|
|
|
} catch (IOException e) { |
|
|
|
throw die(e.getMessage(), e); |
|
|
|
} |
|
|
|
} |
|
|
|
} |