Merge branch 'bk/fix-relative-gitdir-file'
commitbd0d1916de221425fc22b69940ff71b0ce6aad9c
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:38:34 +0000 (20 14:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:38:34 +0000 (20 14:38 -0800)
treede5b8e222e87202fc4c7159cb284a165f101939f
parentc757c52f63cfaa9446f9ae93e44acc6ca610650f
parent40c813e00c8de5725c7a6bb127fadedcce1f788f
Merge branch 'bk/fix-relative-gitdir-file'

* bk/fix-relative-gitdir-file:
  Handle relative paths in submodule .git files
  Test update-index for a gitlink to a .git file
setup.c