summaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
Diffstat (limited to 'git-pull-script')
-rwxr-xr-xgit-pull-script5
1 files changed, 2 insertions, 3 deletions
diff --git a/git-pull-script b/git-pull-script
index 961edc4..0ef6be3 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,5 +1,7 @@
#!/bin/sh
#
+. git-sh-setup-script || die "Not a git archive"
+
merge_repo=$1
merge_name=$(echo "$1" | sed 's:\.git/*$::')
@@ -15,9 +17,6 @@ then
merge_head="refs/${type}s/$2"
fi
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \