summaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 17:57:21 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 17:57:21 (GMT)
commitb33e9666082ce692e64ccfd688dc2a5075566f75 (patch)
treec4c5637417a6e7c3e4c7d38b82e73cf4ef1c09fa /git-pull-script
parentacb46f8769dd0031a98a284e06ebc5a09b151bfd (diff)
downloadgit-b33e9666082ce692e64ccfd688dc2a5075566f75.zip
git-b33e9666082ce692e64ccfd688dc2a5075566f75.tar.gz
git-b33e9666082ce692e64ccfd688dc2a5075566f75.tar.bz2
Add "git-sh-setup-script" for common git shell script setup
It sets up the normal git environment variables and a few helper functions (currently just "die()"), and returns ok if it all looks like a git archive. So use it something like . git-sh-setup-script || die "Not a git archive" to make the rest of the git scripts more careful and readable.
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 \