diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2012-07-04 15:08:13 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2015-03-12 18:18:45 -0700 |
| commit | 6bc48cdc62287934ce1b7003280b19a5994e7668 (patch) | |
| tree | 04b02cb8716b67b9a2db2b447a2ea424f8b71433 /org.eclipse.jgit/resources | |
| parent | 9041fbc958e3f1d19d3ff1285c41201336d5369f (diff) | |
| download | jgit-6bc48cdc62287934ce1b7003280b19a5994e7668.tar.gz jgit-6bc48cdc62287934ce1b7003280b19a5994e7668.zip | |
CommitBuilder should check for duplicate parents
When setting the parents of a commit with setParentIds() or
addParentId() it should be checked that we don't have duplicate parents.
An IllegalArgumentException should be thrown in this case.
Change-Id: I9fa9f31149b7732071b304bca232f037146de454
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index a003b02ccd..61f396c0b5 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -173,6 +173,7 @@ doesNotHandleMode=Does not handle mode {0} ({1}) downloadCancelled=Download cancelled downloadCancelledDuringIndexing=Download cancelled during indexing duplicateAdvertisementsOf=duplicate advertisements of {0} +duplicateParents=The following parent was specified multiple times: {0} duplicateRef=Duplicate ref: {0} duplicateRemoteRefUpdateIsIllegal=Duplicate remote ref update is illegal. Affected remote name: {0} duplicateStagesNotAllowed=Duplicate stages not allowed |