summaryrefslogtreecommitdiff
path: root/line-log.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2013-08-06 13:59:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-08-06 21:36:34 (GMT)
commit815834e9aa6148b7815b9aea7db5d44640a4383a (patch)
tree50eef3bf1d19e4822beb68215a02276b993c86ae /line-log.c
parent5bd9b79a2017daad1d600978b75c714eef74cac0 (diff)
downloadgit-815834e9aa6148b7815b9aea7db5d44640a4383a.zip
git-815834e9aa6148b7815b9aea7db5d44640a4383a.tar.gz
git-815834e9aa6148b7815b9aea7db5d44640a4383a.tar.bz2
line-range: teach -L/RE/ to search relative to anchor point
Range specification -L/RE/ for blame/log unconditionally begins searching at line one. Mailing list discussion [1] suggests that, in the presence of multiple -L options, -L/RE/ should search relative to the endpoint of the previous -L range, if any. Teach the parsing machinery underlying blame's and log's -L options to accept a start point for -L/RE/ searches. Follow-up patches will upgrade blame and log to take advantage of this ability. [1]: http://thread.gmane.org/gmane.comp.version-control.git/229755/focus=229966 Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'line-log.c')
-rw-r--r--line-log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/line-log.c b/line-log.c
index bdadf35..38f827b 100644
--- a/line-log.c
+++ b/line-log.c
@@ -591,7 +591,7 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)
cb_data.line_ends = ends;
if (parse_range_arg(range_part, nth_line, &cb_data,
- lines, &begin, &end,
+ lines, 1, &begin, &end,
full_name))
die("malformed -L argument '%s'", range_part);
if (lines < end || ((lines || begin) && lines < begin))