From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Phillip Wood <phillip.wood123@gmail.com>,
Matt R via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Matt Rogers <mattr94@gmail.com>
Subject: Re: [PATCH 1/1] rebase -r: let `label` generate safer labels
Date: Tue, 03 Sep 2019 12:51:05 -0700 [thread overview]
Message-ID: <xmqq5zm9taza.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1909031256290.46@tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Tue, 3 Sep 2019 13:19:59 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> If you care deeply about double dashes and leading dashes, how about
> this instead?
>
> char *from, *to;
>
> for (from = to = label.buf; *from; from++)
> if ((*from & 0x80) || isalnum(*from))
> *(to++) = *from;
> /* avoid leading dash and double-dashes */
> else if (to != label.buf && to[-1] != '-')
> *(to++) = '-';
> strbuf_setlen(&label, to - label.buf);
Simple enough and is a good change when judged locally.
It still would cause readers to wonder if label_oid() later append
'-%d' to end up with double-dash near the end, etc., which made me
wonder if the resulting code becomes better if sanitization and
uniquefying are done at the same single place in the other message.
next prev parent reply other threads:[~2019-09-03 19:51 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 [this message]
2019-09-03 22:40 ` Matt Rogers
2019-09-02 19:42 ` Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq5zm9taza.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=mattr94@gmail.com \
--cc=phillip.wood123@gmail.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.
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 NNTP newsgroup(s).