From: Isabella Stephens <istephens@atlassian.com>
To: szeder.dev@gmail.com
Cc: git@vger.kernel.org, sunshine@sunshineco.com, peff@peff.net,
bturner@atlassian.com, gitster@pobox.com, jacob.keller@gmail.com,
Isabella Stephens <istephens@atlassian.com>
Subject: [PATCH v3] blame: prevent error if range ends past end of file
Date: Fri, 27 Oct 2017 11:56:52 +1100 [thread overview]
Message-ID: <20171027005652.7796-1-istephens@atlassian.com> (raw)
In-Reply-To: <20171026153111.21813-1-szeder.dev@gmail.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 behavior - instead the
blame is displayed for existing lines within the specified range.
Blaming a range that is entirely outside the bounds of the file will
still fail.
This commit also ammends the relevant test and adds clarification to
the documentation.
Signed-off-by: Isabella Stephens <istephens@atlassian.com>
---
Documentation/git-blame.txt | 10 ++++++++++
builtin/blame.c | 4 ++--
t/t8003-blame-corner-cases.sh | 7 +++----
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index fdc3aea30..8a28b4114 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -154,6 +154,16 @@ Also you can use a regular expression to specify the line range:
which limits the annotation to the body of the `hello` subroutine.
+A range that begins or ends outside the bounds of the file will
+blame the relevant lines. For example:
+
+ git blame -L 10,-20 foo
+ git blame -L 10,+20 foo
+
+will respectively blame the first 10 and last 11 lines of a
+20 line file. However, blaming a line range that is entirely
+outside the bounds of the file will fail.
+
When you are not interested in changes older than version
v2.6.18, or changes older than 3 weeks, you can use revision
range specifiers similar to 'git rev-list':
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..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' '
--
2.14.1
next prev parent reply other threads:[~2017-10-27 0:57 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 ` Isabella Stephens [this message]
2017-10-27 1:58 ` [PATCH v3] " 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=20171027005652.7796-1-istephens@atlassian.com \
--to=istephens@atlassian.com \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.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).