]> git.ipfire.org Git - thirdparty/git.git/blame - git-fetch.sh
[PATCH] Fix symbolic ref validation
[thirdparty/git.git] / git-fetch.sh
CommitLineData
7ef76925
LT
1#!/bin/sh
2#
215a7ad1
JH
3. git-sh-setup || die "Not a git archive"
4. git-parse-remote
853a3697
JH
5_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
6_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
7
ed1aadf1 8tags=
853a3697 9append=
ae2da406 10force=
b10ac50f 11update_head_ok=
ae2da406
JH
12while case "$#" in 0) break ;; esac
13do
14 case "$1" in
15 -a|--a|--ap|--app|--appe|--appen|--append)
16 append=t
ae2da406
JH
17 ;;
18 -f|--f|--fo|--for|--forc|--force)
19 force=t
b10ac50f 20 ;;
ed1aadf1
LT
21 -t|--t|--ta|--tag|--tags)
22 tags=t
23 ;;
b10ac50f
JH
24 -u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\
25 --update-he|--update-hea|--update-head|--update-head-|\
26 --update-head-o|--update-head-ok)
27 update_head_ok=t
ae2da406
JH
28 ;;
29 *)
30 break
31 ;;
32 esac
b10ac50f 33 shift
ae2da406
JH
34done
35
853a3697
JH
36case "$#" in
370)
92c533ef
JH
38 test -f "$GIT_DIR/branches/origin" ||
39 test -f "$GIT_DIR/remotes/origin" ||
b10ac50f 40 die "Where do you want to fetch from today?"
92c533ef 41 set origin ;;
853a3697 42esac
ae2da406 43
853a3697
JH
44remote_nick="$1"
45remote=$(get_remote_url "$@")
46refs=
47rref=
48rsync_slurped_objects=
49
50if test "" = "$append"
51then
52 : >$GIT_DIR/FETCH_HEAD
53fi
54
55append_fetch_head () {
56 head_="$1"
57 remote_="$2"
58 remote_name_="$3"
59 remote_nick_="$4"
60 local_name_="$5"
05dd8e2e
JH
61 case "$6" in
62 t) not_for_merge_='not-for-merge' ;;
63 '') not_for_merge_= ;;
64 esac
853a3697 65
06ec2b4b
JH
66 # remote-nick is the URL given on the command line (or a shorthand)
67 # remote-name is the $GIT_DIR relative refs/ path we computed
68 # for this refspec.
69 case "$remote_name_" in
70 HEAD)
71 note_= ;;
72 refs/heads/*)
73 note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')"
b91fb518 74 note_="branch '$note_' of " ;;
06ec2b4b
JH
75 refs/tags/*)
76 note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
b91fb518 77 note_="tag '$note_' of " ;;
06ec2b4b 78 *)
b91fb518 79 note_="$remote_name of " ;;
06ec2b4b 80 esac
b91fb518
JH
81 remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') &&
82 remote_="$remote_1_"
83 note_="$note_$remote_"
06ec2b4b 84
853a3697
JH
85 # 2.6.11-tree tag would not be happy to be fed to resolve.
86 if git-cat-file commit "$head_" >/dev/null 2>&1
87 then
8572aa85 88 headc_=$(git-rev-parse --verify "$head_^0") || exit
05dd8e2e 89 echo "$headc_ $not_for_merge_ $note_" >>$GIT_DIR/FETCH_HEAD
06ec2b4b
JH
90 echo >&2 "* committish: $head_"
91 echo >&2 " $note_"
853a3697 92 else
05dd8e2e 93 echo "$head_ not-for-merge $note_" >>$GIT_DIR/FETCH_HEAD
06ec2b4b
JH
94 echo >&2 "* non-commit: $head_"
95 echo >&2 " $note_"
853a3697
JH
96 fi
97 if test "$local_name_" != ""
98 then
99 # We are storing the head locally. Make sure that it is
100 # a fast forward (aka "reverse push").
06ec2b4b 101 fast_forward_local "$local_name_" "$head_" "$note_"
853a3697
JH
102 fi
103}
104
105fast_forward_local () {
866ff2f7 106 mkdir -p "$(dirname "$GIT_DIR/$1")"
853a3697
JH
107 case "$1" in
108 refs/tags/*)
109 # Tags need not be pointing at commits so there
110 # is no way to guarantee "fast-forward" anyway.
ae2da406
JH
111 if test -f "$GIT_DIR/$1"
112 then
06ec2b4b 113 echo >&2 "* $1: updating with $3"
ae2da406 114 else
06ec2b4b 115 echo >&2 "* $1: storing $3"
ae2da406 116 fi
bf7960eb
JH
117 git-update-ref "$1" "$2"
118 ;;
ae2da406 119
853a3697 120 refs/heads/*)
bf7960eb
JH
121 # $1 is the ref being updated.
122 # $2 is the new value for the ref.
123 local=$(git-rev-parse --verify "$1^0" 2>/dev/null)
124 if test "$local"
33b83034 125 then
bf7960eb 126 # Require fast-forward.
853a3697
JH
127 mb=$(git-merge-base "$local" "$2") &&
128 case "$2,$mb" in
129 $local,*)
06ec2b4b 130 echo >&2 "* $1: same as $3"
853a3697
JH
131 ;;
132 *,$local)
06ec2b4b 133 echo >&2 "* $1: fast forward to $3"
bf7960eb 134 git-update-ref "$1" "$2" "$local"
853a3697
JH
135 ;;
136 *)
137 false
138 ;;
139 esac || {
06ec2b4b 140 echo >&2 "* $1: does not fast forward to $3;"
bf7960eb
JH
141 case ",$force,$single_force," in
142 *,t,*)
06ec2b4b 143 echo >&2 " forcing update."
bf7960eb 144 git-update-ref "$1" "$2" "$local"
ae2da406
JH
145 ;;
146 *)
bf7960eb 147 echo >&2 " not updating."
ae2da406
JH
148 ;;
149 esac
853a3697
JH
150 }
151 else
bf7960eb
JH
152 echo >&2 "* $1: storing $3"
153 git-update-ref "$1" "$2"
33b83034 154 fi
0a623e7c 155 ;;
853a3697
JH
156 esac
157}
158
b10ac50f
JH
159case "$update_head_ok" in
160'')
bf7960eb 161 orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
b10ac50f
JH
162 ;;
163esac
164
ed1aadf1
LT
165# If --tags (and later --heads or --all) is specified, then we are
166# not talking about defaults stored in Pull: line of remotes or
167# branches file, and just fetch those and refspecs explicitly given.
168# Otherwise we do what we always did.
169
170reflist=$(get_remote_refs_for_fetch "$@")
171if test "$tags"
172then
173 taglist=$(git-ls-remote --tags "$remote" | awk '{ print "."$2":"$2 }')
174 if test "$#" -gt 1
175 then
176 # remote URL plus explicit refspecs; we need to merge them.
177 reflist="$reflist $taglist"
178 else
179 # No explicit refspecs; fetch tags only.
180 reflist=$taglist
181 fi
182fi
183
184for ref in $reflist
853a3697
JH
185do
186 refs="$refs $ref"
f170e4b3 187
853a3697
JH
188 # These are relative path from $GIT_DIR, typically starting at refs/
189 # but may be HEAD
05dd8e2e
JH
190 if expr "$ref" : '\.' >/dev/null
191 then
192 not_for_merge=t
193 ref=$(expr "$ref" : '\.\(.*\)')
194 else
195 not_for_merge=
196 fi
efe9bf0f
JH
197 if expr "$ref" : '\+' >/dev/null
198 then
199 single_force=t
200 ref=$(expr "$ref" : '\+\(.*\)')
201 else
202 single_force=
203 fi
853a3697
JH
204 remote_name=$(expr "$ref" : '\([^:]*\):')
205 local_name=$(expr "$ref" : '[^:]*:\(.*\)')
f170e4b3 206
853a3697
JH
207 rref="$rref $remote_name"
208
209 # There are transports that can fetch only one head at a time...
210 case "$remote" in
211 http://* | https://*)
212 if [ -n "$GIT_SSL_NO_VERIFY" ]; then
213 curl_extra_args="-k"
214 fi
215 head=$(curl -nsf $curl_extra_args "$remote/$remote_name") &&
216 expr "$head" : "$_x40\$" >/dev/null ||
b10ac50f 217 die "Failed to fetch $remote_name from $remote"
0b7a9fc9 218 echo >&2 Fetching "$remote_name from $remote" using http
215a7ad1 219 git-http-fetch -v -a "$head" "$remote/" || exit
60ea0fdd 220 ;;
853a3697
JH
221 rsync://*)
222 TMP_HEAD="$GIT_DIR/TMP_HEAD"
4447badc 223 rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1
bf7960eb 224 head=$(git-rev-parse --verify TMP_HEAD)
853a3697
JH
225 rm -f "$TMP_HEAD"
226 test "$rsync_slurped_objects" || {
4447badc
JH
227 rsync -av --ignore-existing --exclude info \
228 "$remote/objects/" "$GIT_OBJECT_DIRECTORY/" || exit
229
230 # Look at objects/info/alternates for rsync -- http will
231 # support it natively and git native ones will do it on the remote
232 # end. Not having that file is not a crime.
89d844d0
JH
233 rsync -q "$remote/objects/info/alternates" \
234 "$GIT_DIR/TMP_ALT" 2>/dev/null ||
235 rm -f "$GIT_DIR/TMP_ALT"
4447badc
JH
236 if test -f "$GIT_DIR/TMP_ALT"
237 then
238 resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" |
239 while read alt
240 do
241 case "$alt" in 'bad alternate: '*) die "$alt";; esac
242 echo >&2 "Getting alternate: $alt"
243 rsync -av --ignore-existing --exclude info \
244 "$alt" "$GIT_OBJECT_DIRECTORY/" || exit
245 done
246 rm -f "$GIT_DIR/TMP_ALT"
247 fi
853a3697
JH
248 rsync_slurped_objects=t
249 }
250 ;;
251 *)
252 # We will do git native transport with just one call later.
253 continue ;;
254 esac
255
05dd8e2e
JH
256 append_fetch_head "$head" "$remote" \
257 "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
f170e4b3 258
853a3697
JH
259done
260
261case "$remote" in
262http://* | https://* | rsync://* )
263 ;; # we are already done.
264*)
22c67ca8
JH
265 (
266 git-fetch-pack "$remote" $rref || echo failed "$remote"
267 ) |
853a3697
JH
268 while read sha1 remote_name
269 do
22c67ca8
JH
270 case "$sha1" in
271 failed)
272 echo >&2 "Fetch failure: $remote"
273 exit 1 ;;
274 esac
853a3697 275 found=
efe9bf0f 276 single_force=
853a3697
JH
277 for ref in $refs
278 do
279 case "$ref" in
efe9bf0f
JH
280 +$remote_name:*)
281 single_force=t
05dd8e2e
JH
282 not_for_merge=
283 found="$ref"
284 break ;;
285 .+$remote_name:*)
286 single_force=t
287 not_for_merge=t
288 found="$ref"
289 break ;;
290 .$remote_name:*)
291 not_for_merge=t
efe9bf0f
JH
292 found="$ref"
293 break ;;
853a3697 294 $remote_name:*)
05dd8e2e 295 not_for_merge=
853a3697
JH
296 found="$ref"
297 break ;;
298 esac
299 done
853a3697 300 local_name=$(expr "$found" : '[^:]*:\(.*\)')
05dd8e2e
JH
301 append_fetch_head "$sha1" "$remote" \
302 "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
22c67ca8 303 done || exit
853a3697
JH
304 ;;
305esac
b10ac50f
JH
306
307# If the original head was empty (i.e. no "master" yet), or
308# if we were told not to worry, we do not have to check.
309case ",$update_head_ok,$orig_head," in
310*,, | t,* )
311 ;;
312*)
bf7960eb 313 curr_head=$(git-rev-parse --verify HEAD 2>/dev/null)
b10ac50f
JH
314 if test "$curr_head" != "$orig_head"
315 then
bf7960eb 316 git-update-ref HEAD "$orig_head"
b10ac50f
JH
317 die "Cannot fetch into the current branch."
318 fi
319 ;;
320esac