Billy Keyes 17bd72f0e2 Report short sources as conflicts during apply (#63) ...

Previously, this returned an io.ErrUnexpectedEOF. This is not wrong, in
that we did unexpectedly hit the end of the input file, but it is vague
and implies a possible library bug rather than a problem with the patch
or the input. This condition is really a conflict, as the changes
described by the patch are not compatible with the state of the input.

2025-09-03 17:26:05 -07:00

..

testdata

Add a test for removing the last newline in a file (#59)

2025-03-04 20:14:23 -08:00

apply_binary.go

Test with Go 1.19, upgrade golangci-lint (#35)

2022-09-30 22:41:17 -07:00

apply_test.go

Report short sources as conflicts during apply (#63)

2025-09-03 17:26:05 -07:00

apply_text.go

Report short sources as conflicts during apply (#63)

2025-09-03 17:26:05 -07:00

apply.go

Test with Go 1.19, upgrade golangci-lint (#35)

2022-09-30 22:41:17 -07:00

assert_test.go

Add ParsePatchHeader and related types (#6)

2020-04-18 22:21:55 -07:00

base85_test.go

Add String() methods to parsed types (#48)

2024-08-11 11:57:07 -07:00

base85.go

Add String() methods to parsed types (#48)

2024-08-11 11:57:07 -07:00

binary_test.go

Parse binary headers with file paths (#55)

2025-01-07 19:27:03 -08:00

binary.go

Parse binary headers with file paths (#55)

2025-01-07 19:27:03 -08:00

file_header_test.go

Fix parsing of mode lines with trailing space (#38)

2022-12-26 17:56:30 -05:00

file_header.go

Return preamble when a patch has no files (#46)

2024-07-14 20:44:16 -07:00

format_roundtrip_test.go

Fix binary headers in formatted patches (#56)

2025-01-07 19:35:14 -08:00

format_test.go

Add String() methods to parsed types (#48)

2024-08-11 11:57:07 -07:00

format.go

Fix binary headers in formatted patches (#56)

2025-01-07 19:35:14 -08:00

gitdiff_test.go

Add validation function for text fragment

2020-01-05 20:36:01 -08:00

gitdiff.go

Add String() methods to parsed types (#48)

2024-08-11 11:57:07 -07:00

io_test.go

Fix EOF error for some files without final newline (#27)

2021-08-19 17:32:18 -07:00

io.go

Fix EOF error for some files without final newline (#27)

2021-08-19 17:32:18 -07:00

parser_test.go

Return preamble when a patch has no files (#46)

2024-07-14 20:44:16 -07:00

parser.go

Return preamble when a patch has no files (#46)

2024-07-14 20:44:16 -07:00

patch_header_test.go

Follow git logic when parsing patch identities (#44)

2024-05-05 20:16:19 -07:00

patch_header.go

Follow git logic when parsing patch identities (#44)

2024-05-05 20:16:19 -07:00

patch_identity_test.go

Follow git logic when parsing patch identities (#44)

2024-05-05 20:16:19 -07:00

patch_identity.go

Follow git logic when parsing patch identities (#44)

2024-05-05 20:16:19 -07:00

text_test.go

Return errors for empty text fragments (#29)

2021-09-12 15:51:00 -07:00

text.go

Return errors for empty text fragments (#29)

2021-09-12 15:51:00 -07:00