Discard stashed hunk -- how to get it working?

Does unstashing individual hunks actually work? This consistently fails on every git repo on my Mac.

Steps:

1. Checkout a repo.

2. Make some changes. (even just 1 tiny change)

3. Stash changes.

4. View the Stash.

5. Press "Discard Hunk" on any hunk.

Expected: discard the hunk.

Actual: the attached error message.

Question: Am I doing something wrong, or is this feature just broken out of the box?

1 answer

1 accepted

I don't think you can modify stashes in this way. SourceTree always displays the "Discard Hunk" and related buttons in the diff view, even though they aren't relevant here.

The reason for this is that all of those types of changes (discarding hunks or file changes) are performed on your working copy, but your stash is, by definition, not on your working copy.

To get what you want, you should apply the stash to a clean working copy, make the modifications you want, then create a new stash.

You may consider filing a bug at jira.atlassian.comrequesting that the developers remove/disable those buttons when viewing stashed diffs. If so, answer this question with a link so others can vote it up if they want to.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Jodi LeBlanc
Posted 15 hours ago in Off-topic

Friday Fun: How do you recharge your batteries after a busy week?

Happy Friday – Fun Day! I don’t know about you, but I have been giving everything I’ve got this week (and most weeks) and come Friday I look for unique ways to recharge my batteries - rest, relax, a...

145 views 21 4
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you