undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revision: disable min_age optimization with line-log

Browse Source 
If one of the options --before, --min-age or --until is given,
limit_list() filters out younger commits early on.  Line-log needs all
those commits to trace the movement of line ranges, though.  Skip this
optimization if both are used together.

Reported-by: Мария Долгополова <dolgopolovamariia@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2020-07-04 14:56:32 +02:00 committed by Junio C Hamano
parent a08a83db2b
commit 01faa91cb7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
revision.c
View File

@ -1410,7 +1410,8 @@ static int limit_list(struct rev_info *revs)
continue; continue;
break; break;
} }
if (revs->min_age != -1 && (commit->date > revs->min_age)) if (revs->min_age != -1 && (commit->date > revs->min_age) &&
!revs->line_level_traverse)
continue; continue;
date = commit->date; date = commit->date;
p = &commit_list_insert(commit, p)->next; p = &commit_list_insert(commit, p)->next;

8
t/t4211-line-log.sh
View File

@ -240,10 +240,12 @@ test_expect_success 'setup for checking line-log and parent oids' '
EOF EOF
git add file.c && git add file.c &&
test_tick && test_tick &&
first_tick=$test_tick &&
git commit -m "Add func1() and func2() in file.c" && git commit -m "Add func1() and func2() in file.c" &&
echo 1 >other-file && echo 1 >other-file &&
git add other-file && git add other-file &&
test_tick &&
git commit -m "Add other-file" && git commit -m "Add other-file" &&
sed -e "s/F1/F1 + 1/" file.c >tmp && sed -e "s/F1/F1 + 1/" file.c >tmp &&
@ -283,4 +285,10 @@ test_expect_success 'parent oids with parent rewriting' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'line-log with --before' '
echo $root_oid >expect &&
git log --format=%h --no-patch -L:func2:file.c --before=$first_tick >actual &&
test_cmp expect actual
'
test_done test_done