| Message ID | 694aeb19f57297d9b9d07d47897385bdbedd309c.1657685948.git.matheus.bernardino@usp.br (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | checkout: fix two bugs on count of updated entries | expand |
Matheus Tavares <matheus.bernardino@usp.br> writes: > At the end of a `git checkout <pathspec>` operation, git reports how > many paths were checked out with a message like "Updated N paths from > the index". However, entries that end up on the delayed checkout queue > (as requested by a long-running process filter) get counted twice, > producing a wrong number in the final report. We will fix this bug in an > upcoming commit. For now, only document/demonstrate it with a > test_expect_failure. > > Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> > --- > t/t0021-conversion.sh | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh > index bad37abad2..00df9b5c18 100755 > --- a/t/t0021-conversion.sh > +++ b/t/t0021-conversion.sh > @@ -1132,4 +1132,26 @@ do > ' > done > > +test_expect_failure PERL 'delayed checkout correctly reports the number of updated entries' ' It is unfortunate that we depend on Perl only to run rot13-filter; I'll leave a #leftoverbit label here to remind us to write a "test-tool rot13-filter" someday. No need to do so in this series. > + rm -rf repo && > + git init repo && > + ( > + cd repo && > + git config filter.delay.process "../rot13-filter.pl delayed.log clean smudge delay" && > + git config filter.delay.required true && > + > + echo "*.a filter=delay" >.gitattributes && > + echo a >test-delay10.a && > + echo a >test-delay11.a && > + git add . && > + git commit -m files && > + > + rm *.a && > + git checkout . 2>err && > + grep "IN: smudge test-delay10.a .* \\[DELAYED\\]" delayed.log && > + grep "IN: smudge test-delay11.a .* \\[DELAYED\\]" delayed.log && > + grep "Updated 2 paths from the index" err > + ) > +' > + > test_done
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index bad37abad2..00df9b5c18 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -1132,4 +1132,26 @@ do ' done +test_expect_failure PERL 'delayed checkout correctly reports the number of updated entries' ' + rm -rf repo && + git init repo && + ( + cd repo && + git config filter.delay.process "../rot13-filter.pl delayed.log clean smudge delay" && + git config filter.delay.required true && + + echo "*.a filter=delay" >.gitattributes && + echo a >test-delay10.a && + echo a >test-delay11.a && + git add . && + git commit -m files && + + rm *.a && + git checkout . 2>err && + grep "IN: smudge test-delay10.a .* \\[DELAYED\\]" delayed.log && + grep "IN: smudge test-delay11.a .* \\[DELAYED\\]" delayed.log && + grep "Updated 2 paths from the index" err + ) +' + test_done
At the end of a `git checkout <pathspec>` operation, git reports how many paths were checked out with a message like "Updated N paths from the index". However, entries that end up on the delayed checkout queue (as requested by a long-running process filter) get counted twice, producing a wrong number in the final report. We will fix this bug in an upcoming commit. For now, only document/demonstrate it with a test_expect_failure. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> --- t/t0021-conversion.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)