From: Junio C Hamano <gitster@pobox•com>
To: Isabella Stephens <istephens@atlassian•com>
Cc: szeder.dev@gmail•com, git@vger•kernel.org,
sunshine@sunshineco•com, peff@peff•net, bturner@atlassian•com,
jacob.keller@gmail•com
Subject: Re: [PATCH v3] blame: prevent error if range ends past end of file
Date: Fri, 27 Oct 2017 11:01:09 +0900 [thread overview]
Message-ID: <xmqqvaj1cpsq.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqzi8dcpx1.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Fri, 27 Oct 2017 10:58:34 +0900")
Junio C Hamano <gitster@pobox•com> writes:
> For example, with an empty file (i.e. lno == 0), you can ask "git
> blame -L1,-4 ("i.e. "at most four lines, ending at line #1") and the
> code silently accepts the input without noticing that the request is
> an utter nonsense; "file X has only 0 lines" error is given a chance
s/is given/is not given/; obviously. Sorry for a typo coming from
laggy ssh connection.
> to kick in.
>
> There should be an "is the range sensible?" check after all the
> tweaking to bottom and top are done, I think.
>
>> bottom--;
>> range_set_append_unsafe(&ranges, bottom, top);
>> diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
>> index 661f9d430..728209fa3 100755
>> --- a/t/t8003-blame-corner-cases.sh
>> +++ b/t/t8003-blame-corner-cases.sh
>> @@ -216,14 +216,13 @@ test_expect_success 'blame -L with invalid start' '
>> '
>>
>> test_expect_success 'blame -L with invalid end' '
>> - test_must_fail git blame -L1,5 tres 2>errors &&
>> - test_i18ngrep "has only 2 lines" errors
>> + git blame -L1,5 tres >out &&
>> + test_line_count = 2 out
>> '
>>
>> test_expect_success 'blame parses <end> part of -L' '
>> git blame -L1,1 tres >out &&
>> - cat out &&
>> - test $(wc -l < out) -eq 1
>> + test_line_count = 1 out
>> '
>>
>> test_expect_success 'indent of line numbers, nine lines' '
next prev parent reply other threads:[~2017-10-27 2:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 2:19 [PATCH] blame: add --fuzzy-lines command line option Isabella Stephens
2017-10-26 6:15 ` Junio C Hamano
2017-10-26 7:01 ` [PATCH v2] blame: prevent error if range ends past end of file Isabella Stephens
2017-10-26 8:48 ` Jacob Keller
2017-10-26 22:50 ` Isabella Stephens
2017-10-26 15:31 ` SZEDER Gábor
2017-10-26 23:37 ` Isabella Stephens
2017-10-27 0:56 ` [PATCH v3] " Isabella Stephens
2017-10-27 1:58 ` Junio C Hamano
2017-10-27 2:01 ` Junio C Hamano [this message]
2017-10-27 6:18 ` Isabella Stephens
2017-10-27 6:56 ` Eric Sunshine
2018-04-26 7:45 ` [PATCH v4 0/2] blame and log: " istephens
2018-04-26 7:45 ` [PATCH v4 1/2] blame: " istephens
2018-04-27 0:50 ` Junio C Hamano
2018-04-27 1:42 ` Isabella Stephens
2018-04-27 2:09 ` Junio C Hamano
2018-04-27 4:15 ` Isabella Stephens
2018-05-02 2:47 ` Junio C Hamano
2018-05-29 5:30 ` [PATCH v5 0/2] blame and log: " istephens
2018-05-29 5:30 ` [PATCH] blame: " istephens
2018-05-30 8:45 ` Eric Sunshine
2018-05-31 5:07 ` Isabella Stephens
2018-05-29 5:30 ` [PATCH] log: prevent error if line " istephens
2018-05-30 8:59 ` Eric Sunshine
2018-04-26 7:45 ` [PATCH v4 2/2] " istephens
2017-10-26 7:08 ` [PATCH] blame: add --fuzzy-lines command line option Isabella Stephens
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvaj1cpsq.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=bturner@atlassian$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=istephens@atlassian$(echo .)com \
--cc=jacob.keller@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
--cc=szeder.dev@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox