From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] sequencer: tolerate abbreviated stopped-sha file
Date: Wed, 21 Oct 2020 15:56:17 -0700 [thread overview]
Message-ID: <xmqqd01b429a.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201021220353.928067-1-jonathantanmy@google.com> (Jonathan Tan's message of "Wed, 21 Oct 2020 15:03:53 -0700")
Jonathan Tan <jonathantanmy@google.com> writes:
> In 0512eabd91 ("sequencer: stop abbreviating stopped-sha file",
> 2020-09-25), Git was taught both to write full object names to the
> stopped-sha file and to require full object names when reading. However,
> a user would experience a problem if they started an interactive rebase
> using an old version of Git and then continued with a current version of
> Git (for example, if the system version of Git was updated in the
> meantime).
>
> Teach Git to allow object names of any length when reading.
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> Not sure how big of a problem this will potentially be, but I noticed it
> and wanted to mention it.
If I didn't mention that I deliberately chose to declare it a
non-issue during the discussion, that was my mistake.
If this is not causing real-world problem, I'd in principle prefer
to keep the "expect full hex when reading what's supposed to be
written as full hex" sanity checking, but this is a file that is
purely internal between the two invocation of the program and not
even known by mere end users, so I could be persuaded to change my
mind on this particular case.
Assuming that the "use case" is real, the patch is obviously
correct. We won't write anything but a commit object name so
using oid_committish() would not change the behaviour in good
cases.
Thanks.
> ---
> sequencer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 00acb12496..37847d4534 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -2653,7 +2653,7 @@ static int read_populate_opts(struct replay_opts *opts)
> }
>
> if (read_oneliner(&buf, rebase_path_squash_onto(), 0)) {
> - if (get_oid_hex(buf.buf, &opts->squash_onto) < 0) {
> + if (get_oid_committish(buf.buf, &opts->squash_onto) < 0) {
> ret = error(_("unusable squash-onto"));
> goto done_rebase_i;
> }
prev parent reply other threads:[~2020-10-21 22:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 22:03 [PATCH] sequencer: tolerate abbreviated stopped-sha file Jonathan Tan
2020-10-21 22:56 ` Junio C Hamano [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=xmqqd01b429a.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.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).