From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Isabella Stephens <istephens@atlassian.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
gitster@pobox.com, git@vger.kernel.org, sunshine@sunshineco.com,
peff@peff.net, bturner@atlassian.com
Subject: Re: [PATCH v2] blame: prevent error if range ends past end of file
Date: Thu, 26 Oct 2017 17:31:11 +0200 [thread overview]
Message-ID: <20171026153111.21813-1-szeder.dev@gmail.com> (raw)
In-Reply-To: <20171026070108.4185-1-istephens@atlassian.com>
> If the -L option is used to specify a line range in git blame, and the
> end of the range is past the end of the file, at present git will fail
> with a fatal error. This commit prevents such behaviour - instead the
> blame is display for any existing lines within the specified range.
s/is display/is displayed/ ?
'git log' has a very similar -L option, which errors out, too, if the
end of the line range is past the end of the file. IMHO the
interpretation of the line range -L<start>,<end> should be kept
consistent in the two commands, and 'git log' shouldn't error out,
either.
> Signed-off-by: Isabella Stephens <istephens@atlassian.com>
> ---
> builtin/blame.c | 4 ++--
> t/t8003-blame-corner-cases.sh | 5 +++--
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/blame.c b/builtin/blame.c
> index 67adaef4d..b5b9db147 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -878,13 +878,13 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
> nth_line_cb, &sb, lno, anchor,
> &bottom, &top, sb.path))
> usage(blame_usage);
> - if (lno < top || ((lno || bottom) && lno < bottom))
> + if ((lno || bottom) && lno < bottom)
> die(Q_("file %s has only %lu line",
> "file %s has only %lu lines",
> lno), path, lno);
> if (bottom < 1)
> bottom = 1;
> - if (top < 1)
> + if (top < 1 || lno < top)
> top = lno;
> 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..32b3788fe 100755
> --- a/t/t8003-blame-corner-cases.sh
> +++ b/t/t8003-blame-corner-cases.sh
> @@ -216,8 +216,9 @@ 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 &&
> + cat out &&
> + test $(wc -l < out) -eq 2
Please use the test_line_count helper instead, as it will output a
helpful error message on failure, making the 'cat out' above
unnecessary.
> '
>
> test_expect_success 'blame parses <end> part of -L' '
> --
> 2.14.1
>
>
next prev parent reply other threads:[~2017-10-26 15:31 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 [this message]
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
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
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=20171026153111.21813-1-szeder.dev@gmail.com \
--to=szeder.dev@gmail.com \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=istephens@atlassian.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/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).