Skip to content

Commit

Permalink
Fixes show stashed changes with multiple repos
Browse files Browse the repository at this point in the history
  • Loading branch information
eamodio committed May 15, 2019
1 parent 4b2f540 commit d5f8892
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## Fixed

- Fixes the _Show Stashed Changes_ (`gitlens.showQuickStashList`) command with multiple repositories

## [9.7.3] - 2019-05-11

## Fixed
Expand Down
14 changes: 7 additions & 7 deletions src/commands/showQuickStashList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ export class ShowQuickStashListCommand extends ActiveEditorCachedCommand {
async execute(editor?: TextEditor, uri?: Uri, args: ShowQuickStashListCommandArgs = {}) {
uri = getCommandUri(uri, editor);

const repoPath = await getRepoPathOrActiveOrPrompt(
uri,
editor,
`Show stashed changes for which repository${GlyphChars.Ellipsis}`
);
if (!repoPath) return undefined;

const progressCancellation = StashListQuickPick.showProgress('list');

try {
const repoPath = await getRepoPathOrActiveOrPrompt(
uri,
editor,
`Show stashed changes for which repository${GlyphChars.Ellipsis}`
);
if (!repoPath) return undefined;

const stash = await Container.git.getStashList(repoPath);
if (stash === undefined) return window.showWarningMessage('Unable to show stashed changes');

Expand Down

0 comments on commit d5f8892

Please sign in to comment.