diff options
Diffstat (limited to 'git-fetch-script')
| -rwxr-xr-x | git-fetch-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fetch-script b/git-fetch-script index 8a2d37d623..acb1e56e70 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 |