Manually drop successful stash pop with conflicts

[outofambit]

Overview

Closes #7383

Description

• adds --quiet option to stash pop
• adds 1 as a success exit code for stash pop and manually inspects for output
• manually drops stash when its popped but not dropped by git
• updates and adds more test coverage for stash pop

[tierninho]

For testing this, just want to check that this fix only pertains to 1) when there are conflicts in the Changes list, and 2) a stash is popped successfully. Therefore we should drop the stash as expected and the files will remain in the Changes list with the conflicted files?

pop [--index] [-q|--quiet] [<stash>] Remove a single stashed state from the stash list and apply it on top of the current working tree state.

Any changes to the stash list I should look out for and/or is it relevant for testing? Thanks!

[outofambit]

For testing this, just want to check that this fix only pertains to 1) when there are conflicts in the Changes list, and 2) a stash is popped successfully. Therefore we should drop the stash as expected and the files will remain in the Changes list with the conflicted files?

@tierninho this does not apply to situations where there are changes in the working directory. this is only for when you have made commits after making a stash. If those commits touch the same files/lines of any files/lines in the stash, then this comes into play. The expected result is to have the stash popped and dropped.

[shiftkey]

Just one question, everything else looks fine to me

[shiftkey]

LGTM

[tierninho]

LGTM ⚡️