Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Diff skips lines starting with '++ ' or '-- ' #13153

Closed
1 of 3 tasks
zeripath opened this issue Oct 15, 2020 · 0 comments · Fixed by #13154
Closed
1 of 3 tasks

Diff skips lines starting with '++ ' or '-- ' #13153

zeripath opened this issue Oct 15, 2020 · 0 comments · Fixed by #13154
Labels
type/bug
Milestone
1.12.6

Comments

@zeripath
Copy link
Contributor

zeripath commented Oct 15, 2020 •
edited
Loading

Description

First noted in https://codeberg.org/Codeberg/Community/issues/308

Gitea's ParsePatch code in services/gitdiff/gitdiff.go will skip any diff lines that start with "+++ " or "--- ".
zeripath added a commit to zeripath/gitea that referenced this issue Oct 15, 2020
@zeripath
Fix diff skipping lines
ab9e5aa 
ParsePatch previously just skipped all lines that start with "+++ " or "--- "
and makes no attempt to see these lines in context.

This PR rewrites ParsePatch to pay attention to context and position
within a patch, ensuring that --- and +++ are only skipped if
appropriate.

This PR also fixes several issues with incomplete files.

Fix https://codeberg.org/Codeberg/Community/issues/308
Fix go-gitea#13153

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this issue Oct 15, 2020
Merged
zeripath added a commit to zeripath/gitea that referenced this issue Oct 15, 2020
@zeripath
Fix diff skipping lines
453b442 
Backport go-gitea#13154

ParsePatch previously just skipped all lines that start with "+++ " or "--- "
and makes no attempt to see these lines in context.

This PR rewrites ParsePatch to pay attention to context and position
within a patch, ensuring that --- and +++ are only skipped if
appropriate.

This PR also fixes several issues with incomplete files.

Fix https://codeberg.org/Codeberg/Community/issues/308
Fix go-gitea#13153

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this issue Oct 15, 2020
Merged
zeripath added a commit to zeripath/gitea that referenced this issue Oct 15, 2020
@zeripath
Fix diff skipping lines
dd506c8 
Backport go-gitea#13154

ParsePatch previously just skipped all lines that start with "+++ " or "--- "
and makes no attempt to see these lines in context.

This PR rewrites ParsePatch to pay attention to context and position
within a patch, ensuring that --- and +++ are only skipped if
appropriate.

This PR also fixes several issues with incomplete files.

Fix https://codeberg.org/Codeberg/Community/issues/308
Fix go-gitea#13153

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this issue Oct 15, 2020
Merged
@lunny lunny added the type/bug label Oct 15, 2020
@lunny lunny added this to the 1.12.6 milestone Oct 15, 2020
techknowlogick pushed a commit that referenced this issue Oct 16, 2020
@zeripath @lafriks
Fix diff skipping lines (#13154)
6bab678 
* Fix diff skipping lines

ParsePatch previously just skipped all lines that start with "+++ " or "--- "
and makes no attempt to see these lines in context.

This PR rewrites ParsePatch to pay attention to context and position
within a patch, ensuring that --- and +++ are only skipped if
appropriate.

This PR also fixes several issues with incomplete files.

Fix https://codeberg.org/Codeberg/Community/issues/308
Fix #13153

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Add testcase

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix comment

* simplify error handling

Signed-off-by: Andrew Thornton <art27@cantab.net>

* never return io.EOF

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
techknowlogick pushed a commit that referenced this issue Oct 16, 2020
@zeripath
Fix diff skipping lines (#13157)
e6a8204 
* Fix diff skipping lines

Backport #13154

ParsePatch previously just skipped all lines that start with "+++ " or "--- "
and makes no attempt to see these lines in context.

This PR rewrites ParsePatch to pay attention to context and position
within a patch, ensuring that --- and +++ are only skipped if
appropriate.

This PR also fixes several issues with incomplete files.

Fix https://codeberg.org/Codeberg/Community/issues/308
Fix #13153

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Add testcase

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix comment

* simplify error handling

Signed-off-by: Andrew Thornton <art27@cantab.net>

* never return io.EOF

Signed-off-by: Andrew Thornton <art27@cantab.net>
techknowlogick added a commit that referenced this issue Oct 17, 2020
@zeripath @techknowlogick
Fix diff skipping lines (#13155)
e9649b3 
* Fix diff skipping lines

Backport #13154

ParsePatch previously just skipped all lines that start with "+++ " or "--- "
and makes no attempt to see these lines in context.

This PR rewrites ParsePatch to pay attention to context and position
within a patch, ensuring that --- and +++ are only skipped if
appropriate.

This PR also fixes several issues with incomplete files.

Fix https://codeberg.org/Codeberg/Community/issues/308
Fix #13153

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Add testcase

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix comment

* simplify error handling

Signed-off-by: Andrew Thornton <art27@cantab.net>

* never return io.EOF

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
1.12.6
Development

Successfully merging a pull request may close this issue.

Fix diff skipping lines zeripath/gitea
2 participants
@lunny @zeripath