Join GitHub today
rebase-merges: improve --rebase-merges label generation #2315
I believe the sign off should be the proper name you go by, rather than an abbreviation.
If changing the commit message, you should mention that the underlying issue is in the allowable characters on NTFS and FAT file systems as the label names effectively create refs on the file system.
A simple force push of the updated PR branch is all that's needed to do an update.
Otherwise LGTM. At least it fixes the primary problem of colon characters in merge messages.
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 <email@example.com> Signed-off-by: Johannes Schindelin <firstname.lastname@example.org>