[PATCH 1/6] line-range: fix "blame -L X,-N" regression
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 17, 2013, 21:25 UTC
- Message-ID
- <1374096332-7891-2-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1374096332-7891-1-git-send-email-sunshine@sunshineco.com>
"blame -L X,-N" is documented as blaming "N lines ending at X". In practice, the behavior is achieved by swapping the two range endpoints if the second is less than the first. 25ed3412 (Refactor parse_loc; 2013-03-28) broke this interpretation by removing the swapping code from blame.c and failing to add it to line-range.c along with other code relocated from blame.c. Thus, such a range is effectively treated as empty. Fix this regression.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> --- line-range.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/line-range.c b/line-range.c index 8faf943..3942475 100644 --- a/line-range.c +++ b/line-range.c @@ -211,6 +211,8 @@ int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb, void *cb_data, long lines, long *begin, long *end, const char *path) { + *begin = *end = 0; + if (*arg == ':') { arg = parse_range_funcname(arg, nth_line_cb, cb_data, lines, begin, end, path); if (!arg || *arg) @@ -226,6 +228,11 @@ int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb, if (*arg) return -1; + if (*begin && *end && *end < *begin) { + long tmp; + tmp = *end; *end = *begin; *begin = tmp; + } + return 0; }
-- 1.8.3.3.1016.g4f0baba