From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: phillip.wood@dunelm.org.uk
Cc: Matt R via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Matt R <mattr94@gmail.com>
Subject: Re: [PATCH 1/1] rebase -r: let `label` generate safer labels
Date: Mon, 2 Sep 2019 21:42:18 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1909022124350.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <444f3ec4-abdf-1aa9-e8a8-8b5346b939e8@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3631 bytes --]
Hi Phillip,
On Mon, 2 Sep 2019, Phillip Wood wrote:
> This is definitely worth fixing, I've got a couple of comments below
>
> On 02/09/2019 15:01, Matt R via GitGitGadget wrote:
> > From: Matt R <mattr94@gmail.com>
I just noticed that the surname is abbreviated. The full name of the
author is "Matt Rogers". (Matt, Git uses the Signed-off-by: lines as
some sort of legally-binding assurance that you are free to submit these
changes under the GPLv2, so your full name is kinda required.)
> > The `label` todo command in interactive rebases creates temporary refs
> > in the `refs/rewritten/` namespace. These refs are stored as loose refs,
> > i.e. as files in `.git/refs/rewritten/`, therefore they have to conform
> > with file name limitations on the current filesystem.
> >
> > This poses a problem in particular on NTFS/FAT, where e.g. the colon
> > character is not a valid part of a file name.
>
> Being picking I'll point out that ':' is not a valid in refs either.
True, but that was not the primary concern here ;-)
> Looking at
> https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file I
> think only " and | are not allowed on NTFS/FAT but are valid in refs
> (see the man page for git check-ref-format for all the details). So
> the main limitation is actually what git allows in refs.
Right. And this example shows that we really need to be a bit more
conservative than just disallowing characters that would not be allowed
in refs.
I think it is more important to keep in mind the vagaries of various
current and future filesystems to justify the change in this patch.
> > Let's safeguard against this by replacing not only white-space
> > characters by dashes, but all non-alpha-numeric ones.
> >
> > However, we exempt non-ASCII UTF-8 characters from that, as it should be
> > quite possible to reflect branch names such as `↯↯↯` in refs/file names.
> >
> > Signed-off-by: Matthew Rogers <mattr94@gmail.com>
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> > sequencer.c | 12 +++++++++++-
> > t/t3430-rebase-merges.sh | 5 +++++
> > 2 files changed, 16 insertions(+), 1 deletion(-)
> >
> > diff --git a/sequencer.c b/sequencer.c
> > index 34ebf8ed94..23f4a0876a 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -4635,8 +4635,18 @@ static int make_script_with_merges(struct
> > pretty_print_context *pp,
> > else
> > strbuf_addbuf(&label, &oneline);
> > + /*
> > + * Sanitize labels by replacing non-alpha-numeric characters
> > + * (including white-space ones) by dashes, as they might be
> > + * illegal in file names (and hence in ref names).
> > + *
> > + * Note that we retain non-ASCII UTF-8 characters (identified
> > + * via the most significant bit). They should be all
> > acceptable
> > + * in file names. We do not validate the UTF-8 here, that's
> > not
> > + * the job of this function.
> > + */
> > for (p1 = label.buf; *p1; p1++)
> > - if (isspace(*p1))
> > + if (!(*p1 & 0x80) && !isalnum(*p1))
> > *(char *)p1 = '-';
>
> I'm sightly concerned that this opens the possibility for unexpected effects
> if two different labels get sanitized to the same string. I suspect it's
> unlikely to happen in practice but doing something like percent encoding
> non-alphanumeric characters would avoid the problem entirely.
Oh, but we make sure that the labels are unique, via the `label_oid()`
function! Otherwise, we would not be able to label more than one merge
parent ;-)
Ciao,
Dscho
next prev parent reply other threads:[~2019-09-02 19:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-02 14:01 [PATCH 0/1] Make git rebase -r's label generation more resilient Johannes Schindelin via GitGitGadget
2019-09-02 14:01 ` [PATCH 1/1] rebase -r: let `label` generate safer labels Matt R via GitGitGadget
2019-09-02 17:57 ` Phillip Wood
2019-09-02 18:29 ` Junio C Hamano
2019-09-02 20:12 ` brian m. carlson
2019-09-02 21:24 ` Philip Oakley
[not found] ` <CAOjrSZtw+wYHxFRQCfb80xzm9OsGDh2rW8uD+AYYdmDPxk5DFQ@mail.gmail.com>
2019-09-02 22:13 ` Philip Oakley
2019-09-03 11:19 ` Johannes Schindelin
2019-09-03 19:51 ` Junio C Hamano
2019-09-03 22:40 ` Matt Rogers
2019-09-02 19:42 ` Johannes Schindelin [this message]
2019-09-03 18:10 ` Junio C Hamano
2019-11-18 20:51 ` Johannes Schindelin
2019-11-17 23:16 ` [PATCH v2 0/2] Make git rebase -r's label generation more resilient Johannes Schindelin via GitGitGadget
2019-11-17 23:16 ` [PATCH v2 1/2] rebase-merges: move labels' whitespace mangling into `label_oid()` Johannes Schindelin via GitGitGadget
2019-11-17 23:16 ` [PATCH v2 2/2] rebase -r: let `label` generate safer labels Matthew Rogers via GitGitGadget
2019-11-18 3:42 ` [PATCH v2 0/2] Make git rebase -r's label generation more resilient Junio C Hamano
2019-11-18 11:23 ` [PATCH] sequencer: handle rebase-merge for "onto" message Danh Doan
2019-11-18 11:57 ` [PATCH v2] sequencer: handle rebase-merges " Doan Tran Cong Danh
2019-11-18 20:15 ` Johannes Schindelin
2019-11-21 0:16 ` [PATCH] sequencer: handle rebase-merge " Junio C Hamano
2019-11-18 20:52 ` [PATCH v2 0/2] Make git rebase -r's label generation more resilient Johannes Schindelin
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.1909022124350.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=mattr94@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).