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

Hasstash #46

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Hasstash #46

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
485ee5f
Made it so people can use an env var (dirtysymb) to set a custom dirt…
Oct 13, 2014
b6ad09a
Added documentation about using the option.
Oct 13, 2016
192f116
Added ability to show if the current branch has any stashes associate…
Oct 13, 2016
f5574fe
Fixed bug that was misreporting stash status.
Oct 13, 2016
71e7cc7
Modified to be more intelligent when determining if the branch has st…
Oct 13, 2016
4ba748e
Reworked code to determine if a stash exists for the current branch.
Dec 2, 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
2 changes: 1 addition & 1 deletion prompt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ find_git_branch() {

find_git_stash() {
local stash
if stash=$(git stash list 2>/dev/null | grep $branch 2> /dev/null); then
if stash=$(git stash list 2>/dev/null | grep "WIP on $branch" 2> /dev/null); then
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't include stashes with messages.

Copy link
Author

Choose a reason for hiding this comment

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

Good point. I did not consider that. I'll correct that shortly.

git_stash="[$hasstash]"
else
git_stash=""
Expand Down