]>
Commit | Line | Data |
---|---|---|
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." | |
59 | git-read-tree -u -m "$orig_head" "$curr_head" || | |
60 | die "You need to first update your working tree." | |
61 | fi | |
62 | ||
63 | merge_head=$(sed -e '/ not-for-merge /d' \ | |
64 | -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \ | |
65 | tr '\012' ' ') | |
66 | ||
67 | case "$merge_head" in | |
68 | '') | |
69 | echo >&2 "No changes." | |
70 | exit 0 | |
71 | ;; | |
72 | ?*' '?*) | |
73 | var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'` | |
74 | if test '' = "$var" | |
75 | then | |
76 | strategy_default_args='-s octopus' | |
77 | else | |
78 | strategy_default_args=$var | |
79 | fi | |
80 | ;; | |
81 | *) | |
82 | var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'` | |
83 | if test '' = "$var" | |
84 | then | |
85 | strategy_default_args='-s recursive' | |
86 | else | |
87 | strategy_default_args=$var | |
88 | fi | |
89 | ;; | |
90 | esac | |
91 | ||
92 | case "$strategy_args" in | |
93 | '') | |
94 | strategy_args=$strategy_default_args | |
95 | ;; | |
96 | esac | |
97 | ||
98 | merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") | |
99 | git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head |