{"thread":{"id":"51629","subject":"[PATCH] git-fast-import.txt: clarify that multiple merge commits are allowed","startedAt":"2019-08-12T17:17:56Z","lastAt":"2019-08-12T17:17:56Z","messageCount":1,"participants":["Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"380320","messageId":"20190812171747.30838-1-newren@gmail.com","threadId":"51629","inReplyTo":null,"subject":"[PATCH] git-fast-import.txt: clarify that multiple merge commits are allowed","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2019-08-12T17:17:47Z","receivedAt":"2019-08-12T17:17:56Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"The grammar for commits used a '?' rather than a '*' on the `merge`\ndirective line, despite the fact that the code allows multiple `merge`\ndirectives in order to support n-way merges.  In fact, elsewhere in\ngit-fast-import.txt there is an explicit declaration that \"an unlimited\nnumber of `merge` commands per commit are permitted by fast-import\".\nFix the grammar to match the intent and implementation.\n\nReported-by: Joachim Klein <joachim.klein@automata.tools>\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n Documentation/git-fast-import.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt\nindex d65cdb3d08..28b447a3e6 100644\n--- a/Documentation/git-fast-import.txt\n+++ b/Documentation/git-fast-import.txt\n@@ -390,7 +390,7 @@ change to the project.\n \t'committer' (SP <name>)? SP LT <email> GT SP <when> LF\n \tdata\n \t('from' SP <commit-ish> LF)?\n-\t('merge' SP <commit-ish> LF)?\n+\t('merge' SP <commit-ish> LF)*\n \t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n \tLF?\n ....\n-- \n2.22.0.661.gd1c9dd82fc.dirty\n\n"}]}