Fix up read_tree() pathspec matching to use "const char **"

diff --git a/git-pull-script b/git-pull-script
index 4ec12bd887e0af896fdfaa1d30219d3e8ff070e8..8e309fc98b97659d08061b0e1f1e6d4f1e43fc32 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/*$::')
@@ -12,15 +14,12 @@ fi
 if [ "$2" ]
 then
    merge_name="$type '$2' of $merge_name"
-   merge_head="refs/{$type}s/$2"
+   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 \
        "$(cat "$GIT_DIR"/HEAD)" \
        "$(cat "$GIT_DIR"/FETCH_HEAD)" \
-       "$merge_name"
+       "Merge $merge_name"