mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / git-pull.sh
blobc3f05f56de300ad48d940def184698fb37c40028
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
5 # Fetch one or more remote refs and merge it/them into the current HEAD.
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 SUBDIRECTORY_OK=Yes
10 . git-sh-setup
11 set_reflog_action "pull $*"
12 require_work_tree
13 cd_to_toplevel
15 test -z "$(git ls-files -u)" ||
16 die "You are in the middle of a conflicted merge."
18 strategy_args= no_summary= no_commit= squash=
19 while :
21 case "$1" in
22 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
23 --no-summa|--no-summar|--no-summary)
24 no_summary=-n ;;
25 --summary)
26 no_summary=$1
28 --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
29 no_commit=--no-commit ;;
30 --sq|--squ|--squa|--squas|--squash)
31 squash=--squash ;;
32 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
33 --strateg=*|--strategy=*|\
34 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
35 case "$#,$1" in
36 *,*=*)
37 strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
38 1,*)
39 usage ;;
41 strategy="$2"
42 shift ;;
43 esac
44 strategy_args="${strategy_args}-s $strategy "
46 -h|--h|--he|--hel|--help)
47 usage
50 # Pass thru anything that may be meant for fetch.
51 break
53 esac
54 shift
55 done
57 orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
58 git-fetch --update-head-ok "$@" || exit 1
60 curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
61 if test "$curr_head" != "$orig_head"
62 then
63 # The fetch involved updating the current branch.
65 # The working tree and the index file is still based on the
66 # $orig_head commit, but we are merging into $curr_head.
67 # First update the working tree to match $curr_head.
69 echo >&2 "Warning: fetch updated the current branch head."
70 echo >&2 "Warning: fast forwarding your working tree from"
71 echo >&2 "Warning: commit $orig_head."
72 git update-index --refresh 2>/dev/null
73 git read-tree -u -m "$orig_head" "$curr_head" ||
74 die 'Cannot fast-forward your working tree.
75 After making sure that you saved anything precious from
76 $ git diff '$orig_head'
77 output, run
78 $ git reset --hard
79 to recover.'
83 merge_head=$(sed -e '/ not-for-merge /d' \
84 -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \
85 tr '\012' ' ')
87 case "$merge_head" in
88 '')
89 curr_branch=$(git symbolic-ref -q HEAD)
90 case $? in
91 0) ;;
92 1) echo >&2 "You are not currently on a branch; you must explicitly"
93 echo >&2 "specify which branch you wish to merge:"
94 echo >&2 " git pull <remote> <branch>"
95 exit 1;;
96 *) exit $?;;
97 esac
98 curr_branch=${curr_branch#refs/heads/}
100 echo >&2 "Warning: No merge candidate found because value of config option
101 \"branch.${curr_branch}.merge\" does not match any remote branch fetched."
102 echo >&2 "No changes."
103 exit 0
105 ?*' '?*)
106 if test -z "$orig_head"
107 then
108 echo >&2 "Cannot merge multiple branches into empty head"
109 exit 1
112 esac
114 if test -z "$orig_head"
115 then
116 git update-ref -m "initial pull" HEAD $merge_head "" &&
117 git read-tree --reset -u HEAD || exit 1
118 exit
121 merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
122 exec git-merge $no_summary $no_commit $squash $strategy_args \
123 "$merge_name" HEAD $merge_head