* [PATCH] git-fast-import.txt: clarify that multiple merge commits are allowed
@ 2019-08-12 17:17 Elijah Newren
0 siblings, 0 replies; only message in thread
From: Elijah Newren @ 2019-08-12 17:17 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Elijah Newren, Joachim Klein
The grammar for commits used a '?' rather than a '*' on the `merge`
directive line, despite the fact that the code allows multiple `merge`
directives in order to support n-way merges. In fact, elsewhere in
git-fast-import.txt there is an explicit declaration that "an unlimited
number of `merge` commands per commit are permitted by fast-import".
Fix the grammar to match the intent and implementation.
Reported-by: Joachim Klein <email@example.com>
Signed-off-by: Elijah Newren <firstname.lastname@example.org>
Documentation/git-fast-import.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index d65cdb3d08..28b447a3e6 100644
@@ -390,7 +390,7 @@ change to the project.
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
('from' SP <commit-ish> LF)?
- ('merge' SP <commit-ish> LF)?
+ ('merge' SP <commit-ish> LF)*
(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-08-12 17:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-12 17:17 [PATCH] git-fast-import.txt: clarify that multiple merge commits are allowed Elijah Newren
Code repositories for project(s) associated with this public inbox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).