Skip to content

rebase-merges: improve --rebase-merges label generation #2315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2019
Merged

rebase-merges: improve --rebase-merges label generation #2315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion sequencer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 5 additions & 0 deletions t/t3430-rebase-merges.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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