mirror of
https://github.com/git-for-windows/git.git
synced 2026-03-16 19:41:56 -05:00
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. This poses a problem in particular on NTFS/FAT, where e.g. the colon character is not a valid 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>
This commit is contained in:
committed by
Johannes Schindelin
parent
5b8234a522
commit
3d170b096e
12
sequencer.c
12
sequencer.c
@@ -4598,8 +4598,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 = '-';
|
||||
|
||||
strbuf_reset(&buf);
|
||||
|
||||
@@ -468,4 +468,10 @@ test_expect_success '--rebase-merges with strategies' '
|
||||
test_cmp expect G.t
|
||||
'
|
||||
|
||||
test_expect_success '--rebase-merges with commit that can generate bad characters for filename' '
|
||||
git checkout -b colon-in-label E &&
|
||||
git merge -m "colon: this should work" G &&
|
||||
git rebase --rebase-merges --force-rebase E
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Reference in New Issue
Block a user