X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull-script;h=fc463260bd9dd07e50494e7cbb39ef6833179ff3;hb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;hp=8e309fc98b97659d08061b0e1f1e6d4f1e43fc32;hpb=3ba513c32e7b9102187d94d1c43f33d9559fb334;p=git.git diff --git a/git-pull-script b/git-pull-script index 8e309fc9..fc463260 100755 --- a/git-pull-script +++ b/git-pull-script @@ -1,23 +1,10 @@ #!/bin/sh # . git-sh-setup-script || die "Not a git archive" +. git-parse-remote "$@" +merge_name="$_remote_name" -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="$type '$2' of $merge_name" - merge_head="refs/${type}s/$2" -fi - -git-fetch-script "$merge_repo" "$merge_head" || exit 1 +git-fetch-script "$@" || exit 1 git-resolve-script \ "$(cat "$GIT_DIR"/HEAD)" \