Skip to content

Commit 66ef784

Browse files
committed
Don't print file header when it's not present.
This is needed for rename FileDiffs that do not have a file header.
1 parent 7cb6842 commit 66ef784

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

diff/print.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ func PrintFileDiff(d *FileDiff) ([]byte, error) {
3636
}
3737
}
3838

39-
if err := printFileHeader(&buf, "--- ", d.OrigName, timePtr(d.OrigTime)); err != nil {
40-
return nil, err
41-
}
42-
if err := printFileHeader(&buf, "+++ ", d.NewName, timePtr(d.NewTime)); err != nil {
43-
return nil, err
39+
if d.OrigName != "" || d.OrigTime != nil || d.NewName != "" || d.NewTime != nil {
40+
if err := printFileHeader(&buf, "--- ", d.OrigName, timePtr(d.OrigTime)); err != nil {
41+
return nil, err
42+
}
43+
if err := printFileHeader(&buf, "+++ ", d.NewName, timePtr(d.NewTime)); err != nil {
44+
return nil, err
45+
}
4446
}
4547

4648
ph, err := PrintHunks(d.Hunks)

0 commit comments

Comments
 (0)