Merge branch 'ek/alt-odb-entry-fix' into next
commita5f43e26b1d73a99bb336fe87cd535e490d96540
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2014 19:52:04 +0000 (17 12:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2014 19:52:04 +0000 (17 12:52 -0700)
tree5e97498acb3114fbe5a42470dcb7a063382ed079
parentffef7a18a471018d5f4894cf30c63a7a2032b05c
parent539e75069f5c8f0ecf9e99f1163647aa9f92c5bd
Merge branch 'ek/alt-odb-entry-fix' into next

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