rebase-merges: improve --rebase-merges label generation #2315
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ROGERSM94
force-pushed
the
fix-rebase
branch
2 times, most recently
from
a0c75b3 to
ce33c83
Compare
|
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. |
dscho
reviewed
Aug 30, 2019
|
Hope this update makes it look a bit better |
dscho
reviewed
Sep 2, 2019
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 protected]> Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 2, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 2, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 2, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Sep 2, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 3, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Sep 9, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Sep 10, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Sep 10, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Sep 11, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 12, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 13, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 16, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 16, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Nov 6, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Nov 11, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Nov 11, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Nov 13, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Nov 15, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Nov 16, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Nov 16, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Nov 16, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Nov 16, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Nov 20, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Nov 25, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Nov 25, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Nov 26, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Dec 2, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Dec 7, 2019
rebase-merges: improve --rebase-merges label generation
dscho
added a commit
that referenced
this pull request
Dec 10, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Dec 10, 2019
rebase-merges: improve --rebase-merges label generation
git-for-windows-ci
pushed a commit
that referenced
this pull request
Dec 13, 2019
rebase-merges: improve --rebase-merges label generation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #2307 by replacing all non-alphanumeric ascii characters with '-' and appending an _ to prevent clashes with reserved windows filenames.