From: Junio C Hamano <gitster@pobox.com>
To: "Thomas Bachem via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Patrick Steinhardt <ps@pks.im>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Thomas Bachem <mail@thomasbachem.com>
Subject: Re: [PATCH v3] rerere: keep a background gc from killing a rebase
Date: Fri, 04 Sep 2026 12:08:45 -0700 [thread overview]
Message-ID: <xmqq4ig44ywy.fsf@gitster.g> (raw)
In-Reply-To: <pull.2214.v3.git.1788537081930.gitgitgadget@gmail.com> (Thomas Bachem via GitGitGadget's message of "Fri, 04 Sep 2026 15:51:21 +0000")
"Thomas Bachem via GitGitGadget" <gitgitgadget@gmail.com> writes:
> semantics of core.packedRefsTimeout, then warn and go on without
> rerere: a lost recording or replay is nothing next to a rebase that
> cannot continue.
I do not understand the logic at the latter half of the above
sentence. During a rebase, any and all opportunity to reuse a
conflict resolution you made earlier is preferrable.
I would be fine if "we cannot grab the lock so let's skip without
doing 'rerere gc' at all". But if a conflicted step in rebase that
stops and leaves conflicts in the working tree fails to record the
preimage of a conflicted path, and makes the user realize that was
what happened only after the user spends significant amount of work
to resolve the conflicts and the resolution is not added to the
rerere database, that is a huge loss.
Perhaps it is just the way the above three lines is stated and what
the code actually does may not be problematic, but I am not sure if
that is what the latter half of the above sentence is trying to say.
Thanks.
next prev parent reply other threads:[~2026-09-04 19:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-02 8:31 [PATCH] rerere: keep a background gc from killing a rebase Thomas Bachem via GitGitGadget
2026-09-02 13:27 ` Phillip Wood
2026-09-02 15:07 ` Thomas Bachem
2026-09-03 13:50 ` Phillip Wood
2026-09-03 7:40 ` Patrick Steinhardt
2026-09-03 8:11 ` Thomas Bachem
2026-09-03 8:32 ` Patrick Steinhardt
2026-09-03 12:12 ` Thomas Bachem
2026-09-03 13:50 ` Phillip Wood
2026-09-04 7:44 ` [PATCH v2] " Thomas Bachem via GitGitGadget
2026-09-04 15:21 ` Phillip Wood
2026-09-04 15:55 ` Thomas Bachem
2026-09-07 10:07 ` Phillip Wood
2026-09-04 17:06 ` Junio C Hamano
2026-09-04 18:17 ` Thomas Bachem
2026-09-04 15:51 ` [PATCH v3] " Thomas Bachem via GitGitGadget
2026-09-04 19:08 ` Junio C Hamano [this message]
2026-09-05 5:41 ` Thomas Bachem
2026-09-05 16:10 ` Junio C Hamano
2026-09-06 10:29 ` Thomas Bachem
2026-09-07 7:41 ` Patrick Steinhardt
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=xmqq4ig44ywy.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=mail@thomasbachem.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.