X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull-script;h=fc463260bd9dd07e50494e7cbb39ef6833179ff3;hb=b55db7ba283c1f7d2ff3cbc7e351d3ae504c9b1d;hp=90ee0f322d8c569a5b02b3be1548eb990b4263c9;hpb=85c1f337be49eaa9a22e42a1c9958deef5ab57c3;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 90ee0f322..fc463260b 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,21 +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 of $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"/FETCH_HEAD)" \
-	"$merge_name"
+	"Merge $merge_name"