Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Jun 2014 19:17:57 +0000 (12:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Jun 2014 19:17:57 +0000 (12:17 -0700)
* jc/rev-parse-argh-dashed-multi-words:
update-index: fix segfault with missing --cacheinfo argument

Trivial merge