ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-14 10:03:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes go back support

Browse Source
This commit is contained in:
Eric Amodio
2017-04-09 01:17:32 -04:00
parent 0d19224a97
commit 3aab904aaf
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands/showCommitSearch.ts
View File

@@ -25,7 +25,7 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
prompt: `Please enter a search string`,
placeHolder: `search by message, author (use a:<name>), files (use f:<pattern>), or sha (use s:<hash>)`
} as InputBoxOptions);
if (!search) return undefined;
if (search === undefined) return goBackCommand && goBackCommand.execute();
if (Git.isSha(search)) {
searchBy = 'sha';
@@ -71,15 +71,13 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
break;
}
if (!goBackCommand) {
// Create a command to get back to the branch history
goBackCommand = new CommandQuickPickItem({
label: `go back \u21A9`,
description: `\u00a0 \u2014 \u00a0\u00a0 to commit search`
}, Commands.ShowCommitSearch, [gitUri, originalSearch]);
}
// Create a command to get back to here
const currentCommand = new CommandQuickPickItem({
label: `go back \u21A9`,
description: `\u00a0 \u2014 \u00a0\u00a0 to commit search`
}, Commands.ShowCommitSearch, [gitUri, originalSearch, undefined, goBackCommand]);
const pick = await CommitsQuickPick.show(this.git, log, placeHolder, goBackCommand);
const pick = await CommitsQuickPick.show(this.git, log, placeHolder, currentCommand);
if (!pick) return undefined;
if (pick instanceof CommandQuickPickItem) {