Hi Neeraj, On Tue, 26 Oct 2021, Neeraj K. Singh via GitGitGadget wrote: > * Fix prune code to be able to work against multiple cruft directories. I > noticed this in self-review. > > * When dscho enabled core.fsyncobjectfiles=batch in git-for-windows we saw > some test-failures in update-index tests. The root cause is that > setup_work_tree does a chdir_notify, which erases the tmp-objdir state. I > now unapply and reapply the tmp-objdir around setup_git_env. > > This branch autosquashes cleanly and it needs to be merged with > ns/batched-fsync, where it currently merges cleanly. > > Neeraj Singh (2): > fixup! tmp-objdir: new API for creating temporary writable databases > fixup! tmp-objdir: new API for creating temporary writable databases Thank you for the fast work on the fixes! I applied both patches to the PR branch and pushed; Let's see how the CI over at https://github.com/git-for-windows/git/pull/3492 pans out. Please note the original patch made it into `next` already (and is hence subject to follow-up patches rather than being rewritten). Therefore, you may need to reword the commit messages so that they stand on their own, as follow-up commits. And alternative would be to ask Junio to kick the topic out of `next` and back to `seen`, in which case you will probably be asked to submit a new iteration of the original patch. Thank you again! Dscho > > builtin/prune.c | 1 + > environment.c | 5 +++++ > tmp-objdir.c | 25 +++++++++++++++++++++++++ > tmp-objdir.h | 15 +++++++++++++++ > 4 files changed, 46 insertions(+) > > > base-commit: 50741b157f2f90df76a60418e2781b2c1e6e3c78 > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1067%2Fneerajsi-msft%2Fns%2Ftmp-objdir-fixes-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1067/neerajsi-msft/ns/tmp-objdir-fixes-v1 > Pull-Request: https://github.com/gitgitgadget/git/pull/1067 > -- > gitgitgadget > >
