Merge branch 'jk/maint-stash-oob' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:58:42 +0000 (14:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:58:42 +0000 (14:58 -0700)
commitbe44a20aa88b196b769dd894c0ac7a9ff5a7a1f6
treef624a14245eb53774ec0443b5dbf0f7fd0fd1149
parent476e42422d3a62a6aa301e41ba3def6882d37e9e
parent9355fc9c35a5c40bbd8e380ec9e36013a1b230ed
Merge branch 'jk/maint-stash-oob' into maint

* jk/maint-stash-oob:
  stash: fix false positive in the invalid ref test.
  stash: fix accidental apply of non-existent stashes

Conflicts:
t/t3903-stash.sh
git-stash.sh
t/t3903-stash.sh