From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2015 20:49:19 +0000 (-0700)
Subject: Merge branch 'jk/stash-require-clean-index' into maint
X-Git-Tag: v2.4.2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb9ec8e23e6aee90f80635fdaaed919fe2c7d675;p=git

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

"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
---

cb9ec8e23e6aee90f80635fdaaed919fe2c7d675