Merge branch 'ek/alt-odb-entry-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2014 18:18:46 +0000 (11:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2014 18:18:46 +0000 (11:18 -0700)
* ek/alt-odb-entry-fix:
sha1_file: do not add own object directory as alternate

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