oppi.li / go-gitdiff
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

While empty patches with only a header were parsable, the parser
discarded the preamble content. This meant callers had to handle this
case specially. Now, if we reach the end of the input without finding a
file, Parse() returns the full content of the patch as the preamble.

authored by

Billy Keyes and committed by
GitHub 0a4e55f9 a00d2cca

+28 -6
+1 -1
gitdiff/file_header.go
··· 57 57 return nil, "", err 58 58 } 59 59 } 60 - return nil, "", nil 60 + return nil, preamble.String(), nil 61 61 } 62 62 63 63 func (p *parser) ParseGitFileHeader() (*File, error) {
+3 -3
gitdiff/parser.go
··· 33 33 if err != nil { 34 34 return files, preamble, err 35 35 } 36 + if len(files) == 0 { 37 + preamble = pre 38 + } 36 39 if file == nil { 37 40 break 38 41 } ··· 50 53 } 51 54 } 52 55 53 - if len(files) == 0 { 54 - preamble = pre 55 - } 56 56 files = append(files, file) 57 57 } 58 58
+16 -2
gitdiff/parser_test.go
··· 281 281 --- could this be a header? 282 282 nope, it's just some dashes 283 283 `, 284 - Output: nil, 285 - Preamble: "", 284 + Output: nil, 285 + Preamble: ` 286 + this is a line 287 + this is another line 288 + --- could this be a header? 289 + nope, it's just some dashes 290 + `, 286 291 }, 287 292 "detatchedFragmentLike": { 288 293 Input: ` ··· 290 295 @@ -1,3 +1,4 ~1,5 @@ 291 296 `, 292 297 Output: nil, 298 + Preamble: ` 299 + a wild fragment appears? 300 + @@ -1,3 +1,4 ~1,5 @@ 301 + `, 293 302 }, 294 303 "detatchedFragment": { 295 304 Input: ` ··· 425 434 }, 426 435 }, 427 436 Preamble: textPreamble, 437 + }, 438 + "noFiles": { 439 + InputFile: "testdata/no_files.patch", 440 + Output: nil, 441 + Preamble: textPreamble, 428 442 }, 429 443 "newBinaryFile": { 430 444 InputFile: "testdata/new_binary_file.patch",
+8
gitdiff/testdata/no_files.patch
··· 1 + commit 5d9790fec7d95aa223f3d20936340bf55ff3dcbe 2 + Author: Morton Haypenny <mhaypenny@example.com> 3 + Date: Tue Apr 2 22:55:40 2019 -0700 4 + 5 + A file with multiple fragments. 6 + 7 + The content is arbitrary. 8 +