From 6bc48cdc62287934ce1b7003280b19a5994e7668 Mon Sep 17 00:00:00 2001 From: Christian Halstrick Date: Wed, 4 Jul 2012 15:08:13 +0200 Subject: 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 --- org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'org.eclipse.jgit/resources/org') 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 -- cgit v1.2.3