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

diff --git a/revision.c b/revision.c
index 223e99db5d49e184f80ae2cd4f8129c786170798..6aa7f4f56755bdc2b79455c61a9882085980f90a 100644 (file)
--- 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 1428eae26299d63262568bf93e3b46671b517660..e186c8325043920cd4bfb79ab4fa2ce021dc7ac4 100755 (executable)
--- 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