From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2013 20:06:11 +0000 (-0700)
Subject: Merge branch 'jc/t1512-fix'
X-Git-Tag: v1.8.4-rc0~74
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eb40e51597eb2cd36fcd4a3e56c9ecaa109ddefc?hp=eb40e51597eb2cd36fcd4a3e56c9ecaa109ddefc

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
---