X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-fetch-script;h=acb1e56e70a974d276eb915a51fc5351801b24a5;hb=a87e8be2aece466e3f41dfde81c80709e1d56cd3;hp=8a2d37d623a71b71b0f1e86184c0bc88a25068df;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git diff --git a/git-fetch-script b/git-fetch-script index 8a2d37d6..acb1e56e 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -9,8 +9,8 @@ if [ "$2" = "tag" ]; then 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