Merge branch 'jc/t1512-fix' into maint
commit069dba2a09cd9a3959194c871f475391b0960844
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:43:01 +0000 (19 10:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:43:02 +0000 (19 10:43 -0700)
tree7a96e7cd990a51be3966ee3832a737408f1b19c4
parente6d6911941fb0d078453a44ec840af57e6578676
parent94d75d1ed5c03b3c0191221f8e3960d808ba7e23
Merge branch 'jc/t1512-fix' into maint

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