From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Neeraj K. Singh via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Neeraj K. Singh" <neerajsi@microsoft.com>
Subject: Re: [PATCH 0/2] tmp-objdir: fix regressions in core.fsyncobjectfiles=batch
Date: Wed, 27 Oct 2021 14:44:00 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2110271439120.56@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <pull.1067.git.1635287730.gitgitgadget@gmail.com>
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
>
>
next prev parent reply other threads:[~2021-10-27 12:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 22:35 [PATCH 0/2] tmp-objdir: fix regressions in core.fsyncobjectfiles=batch Neeraj K. Singh via GitGitGadget
2021-10-26 22:35 ` [PATCH 1/2] fixup! tmp-objdir: new API for creating temporary writable databases Neeraj Singh via GitGitGadget
2021-10-26 22:35 ` [PATCH 2/2] " Neeraj Singh via GitGitGadget
2021-10-27 12:44 ` Johannes Schindelin [this message]
2021-10-27 21:09 ` [PATCH 0/2] tmp-objdir: fix regressions in core.fsyncobjectfiles=batch Junio C Hamano
2021-10-27 22:57 ` Neeraj Singh
2021-10-28 0:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2110271439120.56@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=neerajsi@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).