Merge branch 'rs/fix-alt-odb-path-comparison'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:27:52 +0000 (11:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:27:52 +0000 (11:27 -0700)
* rs/fix-alt-odb-path-comparison:
sha1_file: avoid overrunning alternate object base string

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