Skip to content
Permalink
Browse files

Merge pull request #2315 from ROGERSM94/fix-rebase

rebase-merges: improve --rebase-merges label generation
  • Loading branch information...
dscho committed Sep 2, 2019
2 parents 94ef49f + d3d6c4e commit de7827bd274f5788aaa1b2a1992e45120aa9249b
Showing with 16 additions and 1 deletion.
  1. +11 −1 sequencer.c
  2. +5 −0 t/t3430-rebase-merges.sh
@@ -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 = '-';

strbuf_reset(&buf);
@@ -441,4 +441,9 @@ test_expect_success '--continue after resolving conflicts after a merge' '
test_path_is_missing .git/MERGE_HEAD
'

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

0 comments on commit de7827b

Please sign in to comment.
You can’t perform that action at this time.