diff options
| author | Jonathan Nieder <jrn@google.com> | 2015-03-18 16:26:05 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2015-03-18 16:26:05 -0700 |
| commit | 5967b658381f281496ed61e1dd170cef9bacd7aa (patch) | |
| tree | 4e31789ca41411954d630de70dd19690f2785bf1 /org.eclipse.jgit/resources/org/eclipse | |
| parent | 65c379e02d1d64164f0c4d8486e84493a4add548 (diff) | |
| download | jgit-5967b658381f281496ed61e1dd170cef9bacd7aa.tar.gz jgit-5967b658381f281496ed61e1dd170cef9bacd7aa.zip | |
Revert "CommitBuilder should check for duplicate parents"
This reverts commit 6bc48cdc62287934ce1b7003280b19a5994e7668.
Until git v1.7.10.2~29^2~1 (builtin/merge.c: reduce parents early,
2012-04-17), C git merge would make merge commits with duplicate parents
when asked to with a series of commands like the following:
git checkout origin/master
git merge --no-ff origin/master
Nowadays "git merge" removes redundant parents more aggressively
(whenever one parent is an ancestor of another and not just when
duplicates exist) but merges with duplicate parents are still permitted
and can be created with git fast-import or git commit-tree and history
viewers need to be able to cope with them.
CommitBuilder is an interface analagous to commit-tree, so it should
allow duplicate parents. (That said, an option to automatically remove
redundant parents would be useful.)
Reported-by: Dave Borowitz <dborowitz@google.com>
Change-Id: Ia682238397eb1de8541802210fa875fdd50f62f0
Signed-off-by: Jonathan Nieder <jrn@google.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 0 insertions, 1 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 61f396c0b5..a003b02ccd 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -173,7 +173,6 @@ 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 |