From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Thomas Rast <tr@thomasrast.ch>,
Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 1/4] line-log: demonstrate a bug with nearly-overlapping ranges
Date: Sat, 04 Aug 2018 15:18:23 -0700 (PDT) [thread overview]
Message-ID: <cab7bb36eb85dbe38ad95ee02b083f11f0820e24.1533421100.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.15.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Currently, this test case throws an assertion:
Assertion failed!
Program: git.exe
File: line-log.c, Line 71
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/t4211-line-log.sh | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 436b13ad2..61ff37430 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -115,4 +115,21 @@ test_expect_success 'range_set_union' '
git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c; done)
'
+q_to_lf () {
+ tr Q '\012'
+}
+
+test_expect_failure 'close to overlapping ranges' '
+ test_seq 5 >a1.c &&
+ git add a1.c &&
+ git commit -m "5 lines" a1.c &&
+ sed s/3/3QaQb/ <a1.c | q_to_lf >tmp &&
+ mv tmp a1.c &&
+ git commit -m "2 more lines" a1.c &&
+ sed s/4/cQ4/ <a1.c | q_to_lf >tmp &&
+ mv tmp a1.c &&
+ git commit -m "1 more line" a1.c &&
+ git --no-pager log -L 1,3:a1.c -L 5,8:a1.c
+'
+
test_done
--
gitgitgadget
next prev parent reply other threads:[~2018-08-04 22:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-04 22:18 [PATCH 0/4] line-log: be more careful when adjusting multiple line ranges Johannes Schindelin via GitGitGadget
2018-08-04 22:18 ` Johannes Schindelin via GitGitGadget [this message]
2018-08-05 1:59 ` [PATCH 1/4] line-log: demonstrate a bug with nearly-overlapping ranges Jonathan Nieder
2018-08-06 10:27 ` Johannes Schindelin
2018-08-06 14:47 ` Jonathan Nieder
2018-08-06 15:33 ` Jonathan Nieder
2018-08-04 22:18 ` [PATCH 2/4] line-log: adjust start/end of ranges individually Johannes Schindelin via GitGitGadget
2018-08-05 10:14 ` Eric Sunshine
2018-08-05 10:57 ` Eric Sunshine
2018-08-06 12:52 ` Johannes Schindelin
2018-08-04 22:18 ` [PATCH 3/4] line-log: optimize ranges by joining them when possible Johannes Schindelin via GitGitGadget
2018-08-05 6:11 ` Junio C Hamano
2018-08-05 8:45 ` Andrei Rybak
2018-08-05 10:31 ` Eric Sunshine
2018-08-04 22:18 ` [PATCH 4/4] line-log: convert an assertion to a full BUG() call Johannes Schindelin via GitGitGadget
2018-08-05 10:42 ` Eric Sunshine
2018-08-06 13:14 ` Johannes Schindelin
2018-08-07 9:09 ` Eric Sunshine
2018-08-07 22:00 ` Eric Sunshine
2018-08-05 10:39 ` [PATCH 0/4] line-log: be more careful when adjusting multiple line ranges Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cab7bb36eb85dbe38ad95ee02b083f11f0820e24.1533421100.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=tr@thomasrast.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).