diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2018-10-15 12:21:23 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2018-10-15 12:21:23 +0200 |
| commit | 7a77bde9448c15251cdcca14db20b7bf5c798692 (patch) | |
| tree | 4fa875f1fa57b01dcdfdb17d1b3ba2d0519bd493 /plumbing/format/diff/unified_encoder.go | |
| parent | 0b7d3fe0a47bd7da9c42ba34b9098441120bda02 (diff) | |
| parent | 345ffd95a2cd1413d7f48280e21a035febbe4e10 (diff) | |
| download | go-git-7a77bde9448c15251cdcca14db20b7bf5c798692.tar.gz | |
Merge branch 'master' of github.com:src-d/go-git into annotated
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 { |