diff --git a/git-fetch-script b/git-fetch-script
index 8a2d37d623a71b71b0f1e86184c0bc88a25068df..acb1e56e70a974d276eb915a51fc5351801b24a5 100755 (executable)
--- a/git-fetch-script
+++ b/git-fetch-script
destination="$merge_name"
fi
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
+. git-sh-setup-script || die "Not a git archive"
+
TMP_HEAD="$GIT_DIR/TMP_HEAD"
case "$merge_repo" in