Skip to content
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

Jump to bottom

Git quick open should correct invalid branch names #12194

Merged
merged 10 commits into from
Oct 21, 2016
Merged

Git quick open should correct invalid branch names #12194

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4815228
added missing case for isValidBranchName . at end of name
Sep 17, 2016
368dfc1
added correctBranchName function
Sep 17, 2016
8421e72
git quickopen to correct invalid branch names
Sep 17, 2016
4b88b3d
revert to normal regex instead of groups
Oct 15, 2016
c69db8f
do not correct empty branch names
Oct 15, 2016
b094185
correct invalid input name for BranchCommand
barakd Oct 15, 2016
a7db552
correct invalid input name for BranchCommand
barakd Oct 15, 2016
b9ab526
Merge branch 'git_quick_open_should_correct_invalid_branch_names' of …
barakd Oct 15, 2016
de9d7f6
revert misscomitted settings.json change
barakd Oct 15, 2016
a3284db
hygeine formatting
barakd Oct 15, 2016
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
7 changes: 5 additions & 2 deletions src/vs/workbench/parts/git/browser/gitQuickOpen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { localize } from 'vs/nls';
import { matchesContiguousSubString } from 'vs/base/common/filters';
import { TPromise } from 'vs/base/common/winjs.base';
import Severity from 'vs/base/common/severity';
import { IGitService, RefType, IRef, isValidBranchName } from 'vs/workbench/parts/git/common/git';
import { IGitService, RefType, IRef, isValidBranchName, correctBranchName } from 'vs/workbench/parts/git/common/git';
import { ICommand, CommandQuickOpenHandler } from 'vs/workbench/browser/quickopen';
import { Mode } from 'vs/base/parts/quickopen/common/quickOpen';
import { QuickOpenEntry, IHighlight, IContext, QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel';
Expand Down Expand Up @@ -190,7 +190,10 @@ class CheckoutCommand implements ICommand {
if (currentHeadMatches.length > 0) {
entries.unshift(new CurrentHeadEntry(this.gitService, this.messageService, currentHeadMatches[0].head, currentHeadMatches[0].highlights));

} else if (exactMatches.length === 0 && isValidBranchName(input)) {
} else if (exactMatches.length === 0) {
if (!isValidBranchName(input)) {
input = correctBranchName(input);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we do the same for the git branch command?

}
const branchEntry = new BranchEntry(this.gitService, this.messageService, input);
entries.push(new QuickOpenEntryGroup(branchEntry, 'branch', checkoutEntries.length > 0 || remoteHeadEntries.length > 0));
}
Expand Down
6 changes: 5 additions & 1 deletion src/vs/workbench/parts/git/common/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,11 @@ export interface IAskpassService {
}

// Utils
const invalidBranchPatternName = /(^\.)|(\/\.)|(\.\.)|(~)|(\^)|(:)|(\/$)|(\.lock$)|(\.lock\/)|(\\)|(\*)|(\s)|(^\s*$)|(\.$)/g;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why wrapping everything in groups? The regex is now broken since the ^ and $ were making sure the whole string is matched.


export function isValidBranchName(value: string): boolean {
return !/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$/.test(value);
return !invalidBranchPatternName.test(value);
}
export function correctBranchName(branchName: string): string{
return branchName.replace(invalidBranchPatternName, '-');
}