diff options
Diffstat (limited to 'format/pack/ingest/ingest.go')
| -rw-r--r-- | format/pack/ingest/ingest.go | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/format/pack/ingest/ingest.go b/format/pack/ingest/ingest.go index 4ae7ff2c..df6c6627 100644 --- a/format/pack/ingest/ingest.go +++ b/format/pack/ingest/ingest.go @@ -4,7 +4,8 @@ import "fmt" // ingest initializes transaction state and executes the ingest pipeline. func ingest(state *ingestState) (out Result, err error) { - if err := openTemporaryArtifacts(state); err != nil { + err = openTemporaryArtifacts(state) + if err != nil { return Result{}, err } @@ -15,20 +16,24 @@ func ingest(state *ingestState) (out Result, err error) { } }() - if err := streamPackAndScan(state); err != nil { + err = streamPackAndScan(state) + if err != nil { return Result{}, err } - if err := resolveAll(state); err != nil { + err = resolveAll(state) + if err != nil { return Result{}, err } - if err := maybeFixThin(state); err != nil { + err = maybeFixThin(state) + if err != nil { return Result{}, err } if state.thinFixed { - if err := resolveAll(state); err != nil { + err := resolveAll(state) + if err != nil { return Result{}, err } } @@ -37,19 +42,23 @@ func ingest(state *ingestState) (out Result, err error) { return Result{}, &ErrThinPackUnresolved{Count: len(state.unresolvedRefDeltas)} } - if err := verifyResolvedRecords(state); err != nil { + err = verifyResolvedRecords(state) + if err != nil { return Result{}, err } - if err := state.packFile.Sync(); err != nil { + err = state.packFile.Sync() + if err != nil { return Result{}, &ErrDestinationWrite{Op: fmt.Sprintf("sync pack: %v", err)} } - if err := writeIdx(state); err != nil { + err = writeIdx(state) + if err != nil { return Result{}, err } - if err := writeRev(state); err != nil { + err = writeRev(state) + if err != nil { return Result{}, err } |
