Fix some fast-import parsing issues
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest5 patches 0 repliesNew
- v1 RFC5 patches 3 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | t9300: demonstrate bug with get-mark and empty orphan commitsDocumentation/ t/ | +43 | 0 replies | |
| 2/5 | git-fast-import.txt: fix wording about where ls command can appearDocumentation/ | +2 | 0 replies | |
| 3/5 | fast-import: check most prominent commands firstfast-import.c | +2 | 0 replies | |
| 4/5 | fast-import: only allow cat-blob requests where it makes senseDocumentation/ fast-import.c | +17 | 0 replies | |
| 5/5 | fast-import: fix erroneous handling of get-mark with empty orphan commitsDocumentation/ fast-import.c t/ | +4 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 0/5] Fix some fast-import parsing issues
This series fixes a few issues with parsing in fast-import, dating back to git-2.6.0. The only change since v1 is removing the RFC label; sadly, no one commented on the first round.
Text from my original submission:
The point behind this series is that fast-import somehow mishandled get-mark directives after empty orphan commits. Digging into it, I think it was caused by following a precedent set by a somewhat unsafe implementation of trying to allow cat-blob directives to appear in the middle of a commit. My spelunking showed the following commits seemed to be the most relevant as to how we got to the current state:
777f80d7429b ("fast-import: Allow cat-blob requests at arbitrary
points in stream", 2010-11-28)
8dc6a373d201 ("fast-import: add 'ls' command", 2010-12-02)
97313bef2a16 ("fast-import: use skip_prefix for parsing input",
2014-06-18)
28c7b1f7b7b7 ("fast-import: add a get-mark command", 2015-07-01)I have a few patches that fix the issue and I think make the parser more robust against future issues in a way that I think is safe enough for backward compatibility, but "backward compatible enough" might concern some folks; if so, please take a look at patches 4 and 5.
Elijah Newren (5):
t9300: demonstrate bug with get-mark and empty orphan commits git-fast-import.txt: fix wording about where ls command can appear
fast-import: check most prominent commands first
fast-import: only allow cat-blob requests where it makes sense
fast-import: fix erroneous handling of get-mark with empty orphan
commits
Documentation/git-fast-import.txt | 22 +++++++++--------- fast-import.c | 31 ++++++++++++++------------ t/t9300-fast-import.sh | 37 +++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 24 deletions(-)
Signature · 1 line
2.21.0.1.g0a561c1dbd