[PATCH] Use .git/remote/origin, not .git/branches/origin.
[git.git] / git-pull-script
1 #!/bin/sh
2 #
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' ' ')
8
9 case "$merge_head" in
10 '' | *' '?*) die "Cannot resolve multiple heads at the same time (yet)." ;;
11 esac
12
13
14 git-resolve-script \
15         "$(cat "$GIT_DIR"/HEAD)" \
16         $merge_head "Merge $merge_name"