Use git-merge instead of git-resolve in git-pull.
[git] / git-pull.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2005 Junio C Hamano
4 #
5 # Fetch one or more remote refs and merge it/them into the current HEAD.
6
7 . git-sh-setup || die "Not a git archive"
8
9 usage () {
10     die "git pull [-n] [-s strategy]... <repo> <head>..."
11 }
12
13 strategy_args= no_summary=
14 while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
15 do
16         case "$1" in
17         -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
18                 --no-summa|--no-summar|--no-summary)
19                 no_summary=-n ;;
20         -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
21                 --strateg=*|--strategy=*|\
22         -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
23                 case "$#,$1" in
24                 *,*=*)
25                         strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
26                 1,*)
27                         usage ;;
28                 *)
29                         strategy="$2"
30                         shift ;;
31                 esac
32                 strategy_args="${strategy_args}-s $strategy "
33                 ;;
34         -*)
35                 usage
36                 ;;
37         esac
38         shift
39 done
40
41 orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
42 git-fetch --update-head-ok "$@" || exit 1
43
44 curr_head=$(cat "$GIT_DIR/HEAD")
45 if test "$curr_head" != "$orig_head"
46 then
47         # The fetch involved updating the current branch.
48
49         # The working tree and the index file is still based on the
50         # $orig_head commit, but we are merging into $curr_head.
51         # First update the working tree to match $curr_head.
52
53         echo >&2 "Warning: fetch updated the current branch head."
54         echo >&2 "Warning: fast forwarding your working tree."
55         git-read-tree -u -m "$orig_head" "$curr_head" ||
56                 die "You need to first update your working tree."
57 fi
58
59 merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
60 merge_name=$(
61     perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \
62     "$GIT_DIR"/FETCH_HEAD
63 )
64
65 case "$merge_head" in
66 '')
67         echo >&2 "No changes."
68         exit 0
69         ;;
70 esac
71
72 git-merge $no_summary $strategy_args "Merge $merge_name" HEAD $merge_head