Merge branch 'ek/alt-odb-entry-fix'
commita8c565b227b408cb2ff2064482d2259df16e9e52
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2014 18:18:46 +0000 (21 11:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2014 18:18:46 +0000 (21 11:18 -0700)
treeb9617bbb33abcafa5177518b673a6d7b56e497d2
parent9b1c2a3a8e625ea7f56e9ba3d3c0e31938faa738
parent539e75069f5c8f0ecf9e99f1163647aa9f92c5bd
Merge branch 'ek/alt-odb-entry-fix'

* ek/alt-odb-entry-fix:
  sha1_file: do not add own object directory as alternate
sha1_file.c