Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bitfield/script
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.21.3
Choose a base ref
...
head repository: bitfield/script
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.21.4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 7, 2022

  1. Filter: re-use original pipe, preserving any error status

    @bitfield
    bitfield committed Dec 7, 2022
    Copy the full SHA
    828fe5f View commit details

  2. Filter: preserve previous error if func succeeds

    @bitfield
    bitfield committed Dec 7, 2022
    Copy the full SHA
    d5e838d View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 script.go
11 changes: 7 additions & 4 deletions script.go
View file
Original file line number Diff line number Diff line change
@@ -475,13 +475,16 @@ func (p *Pipe) Filter(filter func(io.Reader, io.Writer) error) *Pipe {
return p
}
pr, pw := io.Pipe()
q := NewPipe().WithReader(pr)
origReader := p.Reader
p = p.WithReader(pr)
go func() {
defer pw.Close()
err := filter(p, pw)
q.SetError(err)
err := filter(origReader, pw)
if err != nil {
p.SetError(err)
}
}()
return q
return p
}

// FilterLine sends the contents of the pipe to the function filter, a line at