diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2018-09-10 11:33:35 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2018-09-10 11:33:35 +0200 |
| commit | bf0593d86ef73f28d3eb097c02d53a6a036f52f7 (patch) | |
| tree | 2cfe20ab4b2ee85280aeabba40fd004d88e8b47f /plumbing/format/diff/unified_encoder.go | |
| parent | f8adfff71d844df7efa1367b7958e8f26411aaf9 (diff) | |
| parent | a2d62f58ea626bb9f41de6431f6f18ca92cf78a0 (diff) | |
| download | go-git-bf0593d86ef73f28d3eb097c02d53a6a036f52f7.tar.gz | |
Merge branch 'master' of github.com:src-d/go-git into f-add-tagging-support
Diffstat (limited to 'plumbing/format/diff/unified_encoder.go')
| -rw-r--r-- | plumbing/format/diff/unified_encoder.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plumbing/format/diff/unified_encoder.go b/plumbing/format/diff/unified_encoder.go index 58edd95..8bd6d8a 100644 --- a/plumbing/format/diff/unified_encoder.go +++ b/plumbing/format/diff/unified_encoder.go @@ -237,9 +237,13 @@ func (c *hunksGenerator) addLineNumbers(la, lb int, linesBefore int, i int, op O // we need to search for a reference for the next diff switch { case linesBefore != 0 && c.ctxLines != 0: - clb = lb - c.ctxLines + 1 + if lb > c.ctxLines { + clb = lb - c.ctxLines + 1 + } else { + clb = 1 + } case c.ctxLines == 0: - clb = lb - c.ctxLines + clb = lb case i != len(c.chunks)-1: next := c.chunks[i+1] if next.Type() == op || next.Type() == Equal { |