summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-09 21:00:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-09 21:00:42 (GMT)
commit20d451c4dab4e41efb315a4c7f9d1eb2d83c4fc5 (patch)
treef71a6fce085cc38e52879cc76abf5bdb2ade935f /revision.c
parentb7ebe8f0479a75e4a8c6be4976330e461592c1f2 (diff)
parent01faa91cb71cf6f5acdf4e683cce08b5e233cfa8 (diff)
downloadgit-20d451c4dab4e41efb315a4c7f9d1eb2d83c4fc5.zip
git-20d451c4dab4e41efb315a4c7f9d1eb2d83c4fc5.tar.gz
git-20d451c4dab4e41efb315a4c7f9d1eb2d83c4fc5.tar.bz2
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
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 223e99d..6aa7f4f 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;