[PATCH] Retire git-parse-remote.
[git/gitweb.git] / git-pull-script
blob8608fcdebc1be7917de38740b3264edf5e0998ec
1 #!/bin/sh
3 . git-sh-setup-script || die "Not a git archive"
4 git-fetch-script "$@" || exit 1
5 merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
6 merge_name=$(sed -e 's/^[0-9a-f]* //' "$GIT_DIR"/FETCH_HEAD |
7 tr '\012' ' ')
9 case "$merge_head" in
10 '' | *' '?*) die "Cannot resolve multiple heads at the same time (yet)." ;;
11 esac
14 git-resolve-script \
15 "$(cat "$GIT_DIR"/HEAD)" \
16 $merge_head "Merge $merge_name"