зеркало из https://github.com/microsoft/git.git
Merge branch 'maint-1.6.5' into maint
* maint-1.6.5: blame: prevent a segv when -L given start > EOF
This commit is contained in:
Коммит
e33cc592de
|
@ -2433,7 +2433,7 @@ parse_done:
|
|||
if (top < 1)
|
||||
top = lno;
|
||||
bottom--;
|
||||
if (lno < top)
|
||||
if (lno < top || lno < bottom)
|
||||
die("file %s has only %lu lines", path, lno);
|
||||
|
||||
ent = xcalloc(1, sizeof(*ent));
|
||||
|
|
|
@ -157,4 +157,12 @@ EOF
|
|||
git --no-pager blame $COMMIT -- uno >/dev/null
|
||||
'
|
||||
|
||||
test_expect_success 'blame -L with invalid start' '
|
||||
test_must_fail git blame -L5 tres 2>&1 | grep "has only 2 lines"
|
||||
'
|
||||
|
||||
test_expect_success 'blame -L with invalid end' '
|
||||
git blame -L1,5 tres 2>&1 | grep "has only 2 lines"
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Загрузка…
Ссылка в новой задаче