Remove unnecessary argument handler in MergeBase.java

Currently the parsing of command line arguments always results in an
error.

```
fatal: Argument "commit-ish" is required
```

This is caused by the fact that the first method (commit_0) is invoked
twice. (As if the multiValued = true). I couldn't figure out, why that
would be the case, as it's defaults to false and RevCommit handler
doesn't seem to have a logic that would override that either.

In any case, defining Arguments like this is unnecessary as it's
sufficient to define a single ArrayList @Argument that will accumulate
all commits.

Change-Id: Ifd1278b3059f86618db05bfe264dd5c00879d82b

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 aacde2f430f3d03a6ad1f8c5088ec272c507a21c..a29c4d9f36e874b7f3ae46f2a10c0c98ac895c2b 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java
@@ -26,11 +26,6 @@ class MergeBase extends TextBuiltin {
        private boolean all;
 
        @Argument(index = 0, metaVar = "metaVar_commitish", required = true)
-       void commit_0(final RevCommit c) {
-               commits.add(c);
-       }
-
-       @Argument(index = 1, metaVar = "metaVar_commitish", required = true)
        private List<RevCommit> commits = new ArrayList<>();
 
        @Override