git-pull: abort when fmt-merge-msg fails.
[git/git.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 USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
8 LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
9 . git-sh-setup
10
11 strategy_args= no_summary= no_commit=
12 while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
13 do
14 case "$1" in
15 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
16 --no-summa|--no-summar|--no-summary)
17 no_summary=-n ;;
18 --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
19 no_commit=--no-commit ;;
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 -h|--h|--he|--hel|--help)
35 usage
36 ;;
37 -*)
38 # Pass thru anything that is meant for fetch.
39 break
40 ;;
41 esac
42 shift
43 done
44
45 orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?"
46 git-fetch --update-head-ok "$@" || exit 1
47
48 curr_head=$(git-rev-parse --verify HEAD)
49 if test "$curr_head" != "$orig_head"
50 then
51 # The fetch involved updating the current branch.
52
53 # The working tree and the index file is still based on the
54 # $orig_head commit, but we are merging into $curr_head.
55 # First update the working tree to match $curr_head.
56
57 echo >&2 "Warning: fetch updated the current branch head."
58 echo >&2 "Warning: fast forwarding your working tree from"
59 echo >&2 "Warning: $orig_head commit."
60 git-update-index --refresh 2>/dev/null
61 git-read-tree -u -m "$orig_head" "$curr_head" ||
62 die 'Cannot fast-forward your working tree.
63 After making sure that you saved anything precious from
64 $ git diff '$orig_head'
65 output, run
66 $ git reset --hard
67 to recover.'
68
69 fi
70
71 merge_head=$(sed -e '/ not-for-merge /d' \
72 -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \
73 tr '\012' ' ')
74
75 case "$merge_head" in
76 '')
77 echo >&2 "No changes."
78 exit 0
79 ;;
80 ?*' '?*)
81 var=`git-repo-config --get pull.octopus`
82 if test -n "$var"
83 then
84 strategy_default_args="-s $var"
85 fi
86 ;;
87 *)
88 var=`git-repo-config --get pull.twohead`
89 if test -n "$var"
90 then
91 strategy_default_args="-s $var"
92 fi
93 ;;
94 esac
95
96 case "$strategy_args" in
97 '')
98 strategy_args=$strategy_default_args
99 ;;
100 esac
101
102 merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
103 git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head