Re: What's cooking in git.git (Sep 2021, #08; Mon, 27)

2 messages, 2 authors, 2021-09-28 · open the first message on its own page

Re: What's cooking in git.git (Sep 2021, #08; Mon, 27)

From: Junio C Hamano <hidden>
Date: 2021-09-28 17:25:14

Ævar Arnfjörð Bjarmason [off-list ref] writes:
I haven't poked at it much, but haven't you and Neeraj Singh (CC'd)
independently come up with two slightly different changes in
tmp-objdir.c to do the same thing? See the tmp-objdir.c part of:

http://lore.kernel.org/git/543ea3569342165363c1602ce36683a54dce7a0b.1632527609.git.gitgitgadget@gmail.com

And your:

http://lore.kernel.org/git/67d3b2b09f9ddda616cdd0d1b12ab7afc73670ed.1630376800.git.gitgitgadget@gmail.com

I.e. yours has the object database managed outside, his has it added to
"struct tmp_objdir", but it's the same objdir dance isn't it?
They touch the same tmp-objdir, but unlike the original use in the
receive-pack (i.e. responding to "git push") with the intention to
add the objects collected in them back to the primary, remerge-diff
wants to discard what was added there at the end.  I do not think it
would directly help the bulk-fsync stuff (but I didn't quite see why
bulk-fsync stuff needed to _add_ new functions to tmp-objdir API,
instead of just being a customer of tmp-objdir API), where it wants
to do the same _migrate() dance in the end.

Re: What's cooking in git.git (Sep 2021, #08; Mon, 27)

From: Neeraj Singh <hidden>
Date: 2021-09-28 21:01:04

On Tue, Sep 28, 2021 at 10:25:08AM -0700, Junio C Hamano wrote:
Ævar Arnfjörð Bjarmason [off-list ref] writes:
quoted
I haven't poked at it much, but haven't you and Neeraj Singh (CC'd)
independently come up with two slightly different changes in
tmp-objdir.c to do the same thing? See the tmp-objdir.c part of:

http://lore.kernel.org/git/543ea3569342165363c1602ce36683a54dce7a0b.1632527609.git.gitgitgadget@gmail.com

And your:

http://lore.kernel.org/git/67d3b2b09f9ddda616cdd0d1b12ab7afc73670ed.1630376800.git.gitgitgadget@gmail.com

I.e. yours has the object database managed outside, his has it added to
"struct tmp_objdir", but it's the same objdir dance isn't it?
They touch the same tmp-objdir, but unlike the original use in the
receive-pack (i.e. responding to "git push") with the intention to
add the objects collected in them back to the primary, remerge-diff
wants to discard what was added there at the end.  I do not think it
would directly help the bulk-fsync stuff (but I didn't quite see why
bulk-fsync stuff needed to _add_ new functions to tmp-objdir API,
instead of just being a customer of tmp-objdir API), where it wants
to do the same _migrate() dance in the end.
Both Elijah and I needed the same functionality of having a writable
ODB in the current process, which wasn't previously provided by tmp-objdir.

I'm making a new patch which is an amalgamation of Elijah's version and mine.
I'll rebase and resend my patch series with that version and I'll also make
a modified version of Elijah's branch available on github.

Thanks,
Neeraj
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help