From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 May 2015 20:17:52 +0000 (-0700)
Subject: Merge branch 'jk/stash-require-clean-index'
X-Git-Tag: v2.5.0-rc0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05c39674f35f33b6d2311da6c63268b9e7739840;p=thirdparty%2Fgit.git

Merge branch 'jk/stash-require-clean-index'

"git stash pop/apply" forgot to make sure that not just the working
tree is clean but also the index is clean. The latter is important
as a stash application can conflict and the index will be used for
conflict resolution.

* jk/stash-require-clean-index:
  stash: require a clean index to apply
  t3903: avoid applying onto dirty index
  t3903: stop hard-coding commit sha1s
---

05c39674f35f33b6d2311da6c63268b9e7739840