Skip to content

Adding git stash drop for issue 76195 - #76342

Merged
João Moreno (joaomoreno) merged 5 commits into
microsoft:masterfrom
drew212:drew212/issue_76195
Oct 25, 2019
Merged

Adding git stash drop for issue 76195#76342
João Moreno (joaomoreno) merged 5 commits into
microsoft:masterfrom
drew212:drew212/issue_76195

Conversation

@drew212

Copy link
Copy Markdown
Contributor

No description provided.

@drew212

Copy link
Copy Markdown
Contributor Author

This is a fix for issue #76195

@drew212

Copy link
Copy Markdown
Contributor Author

João Moreno (@joaomoreno) should the menu item have "..." since this is an action that results in the drop-down menu to select the stash to drop, not sure about the style here.

@joaomoreno João Moreno (joaomoreno) added this to the Backlog milestone Jul 3, 2019
@joaomoreno

Copy link
Copy Markdown
Contributor

João Moreno (@joaomoreno) should the menu item have "..." since this is an action that results in the drop-down menu to select the stash to drop, not sure about the style here.

Yeah, that's the usual pattern.

@joaomoreno João Moreno (joaomoreno) added the git GIT issues label Jul 3, 2019
@drew212

Copy link
Copy Markdown
Contributor Author

Ok, done. Let me know if there are other changes you recommend.

Comment thread extensions/git/package.json Outdated
Comment thread extensions/git/package.json Outdated
Comment thread extensions/git/src/git.ts
Comment thread extensions/git/src/git.ts Outdated
Comment thread extensions/git/package.json Outdated
@MJ-Mohith

Mohith J (MJ-Mohith) commented Aug 22, 2019

Copy link
Copy Markdown

This is really a great feature. I am looking forward to use this feature in our everyday's workflow.
Will it also enable selective drop of stashed contents?

@drew212

Copy link
Copy Markdown
Contributor Author

This is really a great feature. I am looking forward to use this feature in our everyday's workflow.
Will it also enable selective drop of stashed contents?

Yes! The way I've designed this you can selectively drop a stash. Waiting on João Moreno (@joaomoreno) to approve or request more changes.

}

async dropStash(index?: number): Promise<void> {
return await this.run(Operation.Stash, () => this.repository.dropStash(index));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Compile error here, since index can be undefined.

},
{
"command": "git.stashDrop",
"when": "config.get.enabled && gitOpenRepositoryCount != 0"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Typo here: should be git, not get.

Comment thread extensions/git/src/git.ts
try {
await this.run(args);
}
} catch (err) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There's a syntax error here.

image

@joaomoreno
João Moreno (joaomoreno) merged commit d235f18 into microsoft:master Oct 25, 2019
@joaomoreno

Copy link
Copy Markdown
Contributor

There were more issues which I've commented on. But I went ahead and fixed them and merged the PR. Thanks! 🍻

@drew212
Drew Cross (drew212) deleted the drew212/issue_76195 branch October 27, 2019 03:38
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

git GIT issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants