Neeraj Singh <nksingh85@xxxxxxxxx> writes: > Elijah, > > Here's a branch of your changes based on the amalgamated tmp-objdir code: > https://github.com/neerajsi-msft/git/commits/neerajsi/remerge-diff > > This commit adapts your code to use the amalgamated API: > https://github.com/neerajsi-msft/git/commit/725328fe1d8be8326d2ddef78e164ca21450b100 It seems that the discussion petered out at this point. Right now I have a version of ns/remerge-diff before this adjustment in 'seen', and Neeraj's latest version is kept out of 'seen' as they do not play well together without an adjustment like that. What's the good way forward? I do not deeply care which one goes first, but I have a feeling that the need by remerge-diff that wants to discard temporary objects would involve more work to make it safe than the need by batched fsync where newly created objects will not be discarded but merely moved to the primary store before the end of the operation, so from that point of view, it seems simpler and safer to queue ns/batched-fsync topic first (especially given that it is a no-op until the end-user opts into the experiment), and have a remerge-diff that uses the infrastructure from Neeraj's topic. What's your take on the rebase Neeraj made, Elijah (at the URL above)? Thanks.