Merge branch 'jk/alt-odb-cleanup'
commit0538b84027a8aba7e8b805e3ec8fceb3990023e5
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Nov 2016 21:17:30 +0000 (10 13:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Nov 2016 21:17:30 +0000 (10 13:17 -0800)
treee9e2323b28d0eb1c7a3129c07e07d6e2a3c9f08c
parent7b2c338caef2c44e3d1d58ebf5fda1722f5c5daa
parent37a95862c625e1d2ed2609e01b03950253ad4ff9
Merge branch 'jk/alt-odb-cleanup'

Fix a corner-case regression in a topic that graduated during the
v2.11 cycle.

* jk/alt-odb-cleanup:
  alternates: re-allow relative paths from environment
sha1_file.c