diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:00:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:00:42 -0700 |
| commit | 20d451c4dab4e41efb315a4c7f9d1eb2d83c4fc5 (patch) | |
| tree | f71a6fce085cc38e52879cc76abf5bdb2ade935f | |
| parent | Merge branch 'ra/send-email-in-reply-to-from-command-line-wins' into master (diff) | |
| parent | revision: disable min_age optimization with line-log (diff) | |
| download | tgif-20d451c4dab4e41efb315a4c7f9d1eb2d83c4fc5.tar.xz | |
Merge branch 'rs/line-log-until' into master
"git log -Lx,y:path --before=date" lost track of where the range
should be because it didn't take the changes made by the youngest
commits that are omitted from the output into account.
* rs/line-log-until:
revision: disable min_age optimization with line-log
| -rw-r--r-- | revision.c | 3 | ||||
| -rwxr-xr-x | t/t4211-line-log.sh | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 223e99db5d..6aa7f4f567 100644 --- a/revision.c +++ b/revision.c @@ -1410,7 +1410,8 @@ static int limit_list(struct rev_info *revs) continue; 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; date = commit->date; p = &commit_list_insert(commit, p)->next; diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 1428eae262..e186c83250 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -240,10 +240,12 @@ test_expect_success 'setup for checking line-log and parent oids' ' EOF git add file.c && test_tick && + first_tick=$test_tick && git commit -m "Add func1() and func2() in file.c" && echo 1 >other-file && git add other-file && + test_tick && git commit -m "Add other-file" && 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_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 |