Skip to content

Commit 509b2ff

Browse files
committed
Skip file headers if FromFile/ToFile are empty
1 parent e8554b8 commit 509b2ff

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

difflib/difflib.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -585,13 +585,15 @@ func WriteUnifiedDiff(writer io.Writer, diff UnifiedDiff) error {
585585
if len(diff.ToDate) > 0 {
586586
toDate = "\t" + diff.ToDate
587587
}
588-
err := wf("--- %s%s%s", diff.FromFile, fromDate, diff.Eol)
589-
if err != nil {
590-
return err
591-
}
592-
err = wf("+++ %s%s%s", diff.ToFile, toDate, diff.Eol)
593-
if err != nil {
594-
return err
588+
if diff.FromFile != "" || diff.ToFile != "" {
589+
err := wf("--- %s%s%s", diff.FromFile, fromDate, diff.Eol)
590+
if err != nil {
591+
return err
592+
}
593+
err = wf("+++ %s%s%s", diff.ToFile, toDate, diff.Eol)
594+
if err != nil {
595+
return err
596+
}
595597
}
596598
}
597599
first, last := g[0], g[len(g)-1]
@@ -710,8 +712,10 @@ func WriteContextDiff(writer io.Writer, diff ContextDiff) error {
710712
if len(diff.ToDate) > 0 {
711713
toDate = "\t" + diff.ToDate
712714
}
713-
wf("*** %s%s%s", diff.FromFile, fromDate, diff.Eol)
714-
wf("--- %s%s%s", diff.ToFile, toDate, diff.Eol)
715+
if diff.FromFile != "" || diff.ToFile != "" {
716+
wf("*** %s%s%s", diff.FromFile, fromDate, diff.Eol)
717+
wf("--- %s%s%s", diff.ToFile, toDate, diff.Eol)
718+
}
715719
}
716720

717721
first, last := g[0], g[len(g)-1]

0 commit comments

Comments
 (0)