3 # Copyright (c) 2005 Junio C Hamano
5 # Fetch one or more remote refs and merge it/them into the current HEAD.
7 . git-sh-setup || die "Not a git archive"
9 orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
10 git-fetch --update-head-ok "$@" || exit 1
12 curr_head=$(cat "$GIT_DIR/HEAD")
13 if test "$curr_head" != "$orig_head"
15 # The fetch involved updating the current branch.
17 # The working tree and the index file is still based on the
18 # $orig_head commit, but we are merging into $curr_head.
19 # First update the working tree to match $curr_head.
21 echo >&2 "Warning: fetch updated the current branch head."
22 echo >&2 "Warning: fast forwarding your working tree."
23 git-read-tree -u -m "$orig_head" "$curr_head" ||
24 die "You need to first update your working tree."
27 merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
29 perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \
35 echo >&2 "No changes."
39 echo >&2 "Pulling more than one heads; making an Octopus."
45 "$(cat "$GIT_DIR"/HEAD)" \
46 $merge_head "Merge $merge_name"