git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFH] sequencer: simplify logic around stopped-sha file

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Sep 28, 2020, 19:51 UTC
Message-ID
<nycvar.QRO.7.76.6.2009282150190.50@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqo8lsgjxt.fsf@gitster.c.googlers.com>
Hi Junio,
On Sat, 26 Sep 2020, Junio C Hamano wrote:
Show 19 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> >> Is there something obvious I am not seeing that makes this change a
> >> bad idea (other than "somebody may be in the middle of a rebase and
> >> all of a sudden, version of Git gets updated to contain this one,
> >> which is unable to read abbreviated object name the current version
> >> left on disk", which I am deliberately ignoring)?
> >
> > [...]
> > - and most importantly: just like we expand the commit IDs in the todo
> >   list, we actually want to expand them in `stopped-sha` because it _is_
> >   possible that a new object is written that makes the previous
> >   unambiguously abbreviated object ID now ambiguous (e.g. when the user
> >   commits in a separate worktree while the rebase is interrupted, before
> >   continuing the rebase).
>
> Exactly.  I just wasn't sure if stopped-sha is handled with the same
> carefulness as the object names in todo, which are expanded after
> read and shortened before given back to the users.

The main purpose of `stopped-sha` is to let `git rebase --continue` after an `edit` command amend the commit where it stopped _iff_ it is still `HEAD`.

So yes, I think we need to be as careful here.

Ciao, Dscho

Previous: Junio C Hamano
Message 4 of 4 in “[RFH] sequencer: simplify logic around stopped-sha file”
  1. Junio C HamanoSep 25, 2020
  2. Johannes SchindelinSep 26, 2020
  3. Junio C HamanoSep 27, 2020
  4. Johannes SchindelinSep 28, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.