diff options
| author | Kamil Musin <kamilm@google.com> | 2024-10-08 13:25:53 +0200 |
|---|---|---|
| committer | Kamil Musin <kamilm@google.com> | 2024-10-08 14:27:22 +0200 |
| commit | c99c8b9d00063fd177e4e895ac3e155cd2a0b437 (patch) | |
| tree | 469518c110038fd345682f9153910a4fd1f910e8 /org.eclipse.jgit.pgm/src/org/eclipse | |
| parent | dd8c3dab8af85a4c367949c06c648d1e6c9a9f4a (diff) | |
| download | jgit-c99c8b9d00063fd177e4e895ac3e155cd2a0b437.tar.gz jgit-c99c8b9d00063fd177e4e895ac3e155cd2a0b437.zip | |
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
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java | 5 |
1 files changed, 0 insertions, 5 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 aacde2f430..a29c4d9f36 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 @@ -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 |