Skip to content

line-log: small fixes

SZEDER Gábor git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2line-log: fix assertion errorline-log.c t/t4211-line-log.sh t/t4211/sha1/expect.no-assertion-error +1 more+185 -31 reply
2/2line-log: show all line ranges touched by the same diff rangeline-log.c t/t4211/sha1/expect.multiple t/t4211/sha1/expect.two-ranges +2 more+33 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] line-log: small fixes
Quoted 21 lines · Evgeni Chasnovski

Calling git log with several -L flags can result in an error.

Steps to reproduce (on Linux):
- Set up repo with a history:
- mkdir log-line-assert
- cd log-line-assert
- git init
- echo "Line 1\nLine 2" > file
- git add .
- git commit -m 'Commit 1'
- echo "Line 3\nLine 4\nLine 5" >> file
- git add .
- git commit -m 'Commit 2'
- Execute the following command: git log -L2,2:file -L4,4:file

# What did you expect to happen? (Expected behavior)

Show log with evolution of lines 2 and 4.

# What happened instead? (Actual behavior)

Quoted 7 lines

An error with the following text:

```
git: line-log.c:73: range_set_append: Assertion `rs->nr == 0 ||
rs->ranges[rs->nr-1].end <= a' failed.
zsh: IOT instruction (core dumped)  git log -L2,2:file -L4,4:file
```

Thanks for reporting this issue!

As it turns out, merely specifying more than one line range is insufficient to trigger this assertion error, we need a rather specific interaction between the line numbers of two line ranges and a diff range.

The first patch fixes this issue, along with a couple of similar bugs to make that command really work, because once the assertion error was fixed we ended up in an endless loop, and once that was fixed the output was wrong...

The second patch fixes another line-log output issue that I just happened to stumble upon while testing the fixes in the first patch.

SZEDER Gábor (2):
line-log: fix assertion error
line-log: show all line ranges touched by the same diff range

 line-log.c                               | 15 +++-
 t/t4211-line-log.sh                      |  2 +
 t/t4211/sha1/expect.multiple             |  6 ++
 t/t4211/sha1/expect.no-assertion-error   | 90 ++++++++++++++++++++++++
 t/t4211/sha1/expect.two-ranges           |  6 ++
 t/t4211/sha256/expect.multiple           |  6 ++
 t/t4211/sha256/expect.no-assertion-error | 90 ++++++++++++++++++++++++
 t/t4211/sha256/expect.two-ranges         |  6 ++
 8 files changed, 218 insertions(+), 3 deletions(-)
 create mode 100644 t/t4211/sha1/expect.no-assertion-error
 create mode 100644 t/t4211/sha256/expect.no-assertion-error
Signature · 1 line
2.51.0.rc2.346.g6515629ae9