| Message ID | 053045db1459812a1baec8771ff22dcac6f9ad47.1660944574.git.me@ttaylorr.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | midx: permit changing the preferred pack when reusing the MIDX | expand |
On Sat, Aug 20, 2022 at 3:00 AM Taylor Blau <me@ttaylorr.com> wrote: > > The midx_bitmap_partial_tests() function is responsible for setting up a > state where some (but not all) packs in the repository are covered by a > MIDX (and bitmap). > > This function has redirected the `git multi-pack-index write --bitmap`'s > stderr to a file "err" since its introduction back in c51f5a6437 (t5326: > test multi-pack bitmap behavior, 2021-08-31). > > This was likely a stray change left over from a slightly different > version of this test, since the file "err" is never read after being > written. This leads to confusingly-missing output, especially when the > contents of stderr are important. > > Resolve this confusion by avoiding silencing stderr in this case. > > Signed-off-by: Taylor Blau <me@ttaylorr.com> > --- > t/lib-bitmap.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/lib-bitmap.sh b/t/lib-bitmap.sh > index a95537e759..f595937094 100644 > --- a/t/lib-bitmap.sh > +++ b/t/lib-bitmap.sh > @@ -440,7 +440,7 @@ midx_bitmap_partial_tests () { > test_commit packed && > git repack && > test_commit loose && > - git multi-pack-index write --bitmap 2>err && > + git multi-pack-index write --bitmap && > test_path_is_file $midx && > test_path_is_file $midx-$(midx_checksum $objdir).bitmap > ' Thanks Taylor! I would say this is a very good change. It might have been there for some reason when it was written, but that was resisting us to debug what was going on ;-)
On Sat, Aug 20, 2022 at 10:14:03PM +0530, Abhradeep Chakraborty wrote: > On Sat, Aug 20, 2022 at 3:00 AM Taylor Blau <me@ttaylorr.com> wrote: > > diff --git a/t/lib-bitmap.sh b/t/lib-bitmap.sh > > index a95537e759..f595937094 100644 > > --- a/t/lib-bitmap.sh > > +++ b/t/lib-bitmap.sh > > @@ -440,7 +440,7 @@ midx_bitmap_partial_tests () { > > test_commit packed && > > git repack && > > test_commit loose && > > - git multi-pack-index write --bitmap 2>err && > > + git multi-pack-index write --bitmap && > > test_path_is_file $midx && > > test_path_is_file $midx-$(midx_checksum $objdir).bitmap > > ' > > Thanks Taylor! I would say this is a very good change. It might have > been there for some reason when it was written, but that was resisting > us to debug what was going on ;-) :-). I was probably doing something with "err" when I originally wrote this test. But I likely dropped whatever assertion I had written and forgot to stop redirecting stderr. Better late than never ;-). Thanks, Taylor
diff --git a/t/lib-bitmap.sh b/t/lib-bitmap.sh index a95537e759..f595937094 100644 --- a/t/lib-bitmap.sh +++ b/t/lib-bitmap.sh @@ -440,7 +440,7 @@ midx_bitmap_partial_tests () { test_commit packed && git repack && test_commit loose && - git multi-pack-index write --bitmap 2>err && + git multi-pack-index write --bitmap && test_path_is_file $midx && test_path_is_file $midx-$(midx_checksum $objdir).bitmap '
The midx_bitmap_partial_tests() function is responsible for setting up a state where some (but not all) packs in the repository are covered by a MIDX (and bitmap). This function has redirected the `git multi-pack-index write --bitmap`'s stderr to a file "err" since its introduction back in c51f5a6437 (t5326: test multi-pack bitmap behavior, 2021-08-31). This was likely a stray change left over from a slightly different version of this test, since the file "err" is never read after being written. This leads to confusingly-missing output, especially when the contents of stderr are important. Resolve this confusion by avoiding silencing stderr in this case. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- t/lib-bitmap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)