Honour CVS_SERVER.

[git.git] / git-pull-script

diff --git a/git-pull-script b/git-pull-script
index a4ca97c..4ec12bd 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -4,12 +4,15 @@ merge_repo=$1
 
 merge_name=$(echo "$1" | sed 's:\.git/*$::')
 merge_head=HEAD
+type=head
+if [ "$2" = "tag" ]; then
+   type=tag
+   shift
+fi
 if [ "$2" ]
 then
-   merge_name="'$2' branch from
-
-       $merge_name"
-   merge_head="refs/heads/$2"
+   merge_name="$type '$2' of $merge_name"
+   merge_head="refs/{$type}s/$2"
 fi
 
 : ${GIT_DIR=.git}
@@ -19,5 +22,5 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
        "$(cat "$GIT_DIR"/HEAD)" \
-       "$(cat "$GIT_DIR"/MERGE_HEAD)" \
+       "$(cat "$GIT_DIR"/FETCH_HEAD)" \
        "$merge_name"