X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull-script;h=fc463260bd9dd07e50494e7cbb39ef6833179ff3;hb=bbd14cb0113ca26d679970f4db9ad953fb273e36;hp=a4ca97c64566419a0dc02e8e719333d1c9240edc;hpb=ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec;p=git.git

diff --git a/git-pull-script b/git-pull-script
index a4ca97c6..fc463260 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,23 +1,12 @@
 #!/bin/sh
 #
-merge_repo=$1
+. git-sh-setup-script || die "Not a git archive"
+. git-parse-remote "$@"
+merge_name="$_remote_name"
 
-merge_name=$(echo "$1" | sed 's:\.git/*$::')
-merge_head=HEAD
-if [ "$2" ]
-then
-   merge_name="'$2' branch from
-
-	$merge_name"
-   merge_head="refs/heads/$2"
-fi
-
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
-git-fetch-script "$merge_repo" "$merge_head" || exit 1
+git-fetch-script "$@" || exit 1
 
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
-	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
-	"$merge_name"
+	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
+	"Merge $merge_name"