X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull-script;h=fc463260bd9dd07e50494e7cbb39ef6833179ff3;hb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;hp=49f42b5ab2896356952aee9eb2b771f422011f02;hpb=c5434dead6a52a48c520dfa3d8ed24dc3673ab1a;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 49f42b5ab..fc463260b 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"
+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"