From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Sep 2013 18:42:36 +0000 (-0700)
Subject: Merge branch 'nd/git-dir-pointing-at-gitfile'
X-Git-Tag: v1.8.5-rc0~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01e0fa2b3742e41d172933839a75f54d5df36ef3;p=thirdparty%2Fgit.git

Merge branch 'nd/git-dir-pointing-at-gitfile'

We made sure that we notice the user-supplied GIT_DIR is actually a
gitfile, but did not do the same when the default ".git" is a gitfile.

* nd/git-dir-pointing-at-gitfile:
  Make setup_git_env() resolve .git file when $GIT_DIR is not specified
---

01e0fa2b3742e41d172933839a75f54d5df36ef3