From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [RFH] sequencer: simplify logic around stopped-sha file
Date: Mon, 28 Sep 2020 21:51:28 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2009282150190.50@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqo8lsgjxt.fsf@gitster.c.googlers.com>
Hi Junio,
On Sat, 26 Sep 2020, Junio C Hamano wrote:
> 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
prev parent reply other threads:[~2020-09-28 19:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 5:48 [RFH] sequencer: simplify logic around stopped-sha file Junio C Hamano
2020-09-26 21:28 ` Johannes Schindelin
2020-09-27 0:08 ` Junio C Hamano
2020-09-28 19:51 ` Johannes Schindelin [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* 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.2009282150190.50@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).