X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull-script;h=fc463260bd9dd07e50494e7cbb39ef6833179ff3;hb=421cbeb2f7d122177cd0dd456f0ea22480704de3;hp=0585df61e241b302cf007cd75dd6e9fd3b78596a;hpb=7ef76925d9c19ef74874e1735e2436e56d0c4897;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 0585df61..fc463260 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,14 +1,12 @@
 #!/bin/sh
 #
-merge_repo=$1
-merge_name=${2:-HEAD}
+. git-sh-setup-script || die "Not a git archive"
+. git-parse-remote "$@"
+merge_name="$_remote_name"
 
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
-git-fetch-script "$merge_repo" "$merge_name"
+git-fetch-script "$@" || exit 1
 
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
-	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
-	"$merge_repo"
+	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
+	"Merge $merge_name"