Merge branch 'jk/maint-stash-oob' into next
commitd882935bdb7ccec273f5b8b1a5207b98927af04f
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Apr 2011 22:57:12 +0000 (11 15:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Apr 2011 22:57:12 +0000 (11 15:57 -0700)
treea144732a37b1bc1b48685de950f1314c44df501c
parent19e8676da873e5f71e9b46adb224008cb47a4b41
parent9355fc9c35a5c40bbd8e380ec9e36013a1b230ed
Merge branch 'jk/maint-stash-oob' into next

* 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