[PATCH] Add --info-only option to git-update-cache.

diff --git a/git-pull-script b/git-pull-script
index 961edc481b96b0081c816520bc0c4e2cfe5a43f8..0ef6be3547fe75b1758120161e1e3318b56ee6f4 100755 (executable)
--- 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 \