Andrew's git / gitweb.git / diff
?
Merge branch 'jc/t1512-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:06:11 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:06:11 +0000 (13:06 -0700)
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

1  2 
sha1_name.c patch | diff1 | diff2 | blob | history
t/t1512-rev-parse-disambiguation.sh patch | diff1 | diff2 | blob | history
diff --cc sha1_name.c
Simple merge
diff --cc t/t1512-rev-parse-disambiguation.sh
Simple merge