Merge branch 'jc/t1512-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:43:01 +0000 (10:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:43:02 +0000 (10:43 -0700)
* jc/t1512-fix:
get_short_sha1(): correctly disambiguate type-limited abbreviation
t1512: correct leftover constants from earlier edition

1  2 
sha1_name.c
diff --cc sha1_name.c
Simple merge