Merge branch 'jc/t1512-fix'
commiteb40e51597eb2cd36fcd4a3e56c9ecaa109ddefc
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:06:11 +0000 (11 13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:06:11 +0000 (11 13:06 -0700)
tree3b0529b61a5871b7299f606a824bf17b8f62ae76
parentf3930e4389937eccdcaa204b134010e3c34463a4
parent94d75d1ed5c03b3c0191221f8e3960d808ba7e23
Merge branch 'jc/t1512-fix'

A test that should have failed but didn't revealed a bug that needs
to be corrected.

* jc/t1512-fix:
  get_short_sha1(): correctly disambiguate type-limited abbreviation
  t1512: correct leftover constants from earlier edition
sha1_name.c
t/t1512-rev-parse-disambiguation.sh