diff options
| author |  Matthew Rogers <mattr94@gmail.com> | 2019-11-17 23:16:10 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-11-18 12:49:17 +0900 |
| commit | cd5522271f6b985114b33332e148bff2283b0440 (patch) | |
| tree | 82824b8da5b4d71776b43c8755f939c4a7f85b40 /sequencer.c | |
| parent | rebase-merges: move labels' whitespace mangling into `label_oid()` (diff) | |
| download | tgif-cd5522271f6b985114b33332e148bff2283b0440.tar.xz | |
rebase -r: let `label` generate safer labels
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 in addition to the
accepted ref format.
This poses a problem in particular on NTFS/FAT, where e.g. the colon,
double-quote and pipe characters are disallowed as part of a file name.
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 85c66f489f..fece07b680 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4471,8 +4471,26 @@ static const char *label_oid(struct object_id *oid, const char *label, } else { struct strbuf *buf = &state->buf; + /* + * 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 (; *label; label++) - strbuf_addch(buf, isspace(*label) ? '-' : *label); + if ((*label & 0x80) || isalnum(*label)) + strbuf_addch(buf, *label); + /* avoid leading dash and double-dashes */ + else if (buf->len && buf->buf[buf->len - 1] != '-') + strbuf_addch(buf, '-'); + if (!buf->len) { + strbuf_addstr(buf, "rev-"); + strbuf_add_unique_abbrev(buf, oid, default_abbrev); + } label = buf->buf; if ((buf->len == the_hash_algo->hexsz && |