Linus Torvalds | 7ef7692 | 2005-05-22 11:03:24 -0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
freku045@student.liu.se | 87358b7 | 2005-12-13 23:30:31 +0100 | [diff] [blame] | 3 | |
| 4 | USAGE='<fetch-options> <repository> <refspec>...' |
Junio C Hamano | ae2b0f1 | 2005-11-24 00:12:11 -0800 | [diff] [blame] | 5 | . git-sh-setup |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 6 | . git-parse-remote |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 7 | _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' |
| 8 | _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" |
Linus Torvalds | b33e966 | 2005-07-08 10:57:21 -0700 | [diff] [blame] | 9 | |
Junio C Hamano | 221e743 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 10 | LF=' |
| 11 | ' |
| 12 | IFS="$LF" |
| 13 | |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 14 | rloga=fetch |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 15 | no_tags= |
Linus Torvalds | ed1aadf | 2005-09-29 14:35:15 -0700 | [diff] [blame] | 16 | tags= |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 17 | append= |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 18 | force= |
Linus Torvalds | 583122c | 2005-11-18 08:31:55 -0800 | [diff] [blame] | 19 | verbose= |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 20 | update_head_ok= |
Michal Ostrowski | 2c620a1 | 2006-01-20 13:05:24 -0500 | [diff] [blame] | 21 | exec= |
Michal Ostrowski | 96b086d | 2006-01-20 13:38:16 -0500 | [diff] [blame] | 22 | upload_pack= |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 23 | while case "$#" in 0) break ;; esac |
| 24 | do |
| 25 | case "$1" in |
| 26 | -a|--a|--ap|--app|--appe|--appen|--append) |
| 27 | append=t |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 28 | ;; |
Junio C Hamano | 2796a9d | 2006-01-26 18:11:06 -0800 | [diff] [blame] | 29 | --upl|--uplo|--uploa|--upload|--upload-|--upload-p|\ |
| 30 | --upload-pa|--upload-pac|--upload-pack) |
Michal Ostrowski | 2c620a1 | 2006-01-20 13:05:24 -0500 | [diff] [blame] | 31 | shift |
| 32 | exec="--exec=$1" |
Michal Ostrowski | 96b086d | 2006-01-20 13:38:16 -0500 | [diff] [blame] | 33 | upload_pack="-u $1" |
Michal Ostrowski | 2c620a1 | 2006-01-20 13:05:24 -0500 | [diff] [blame] | 34 | ;; |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 35 | -f|--f|--fo|--for|--forc|--force) |
| 36 | force=t |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 37 | ;; |
Linus Torvalds | ed1aadf | 2005-09-29 14:35:15 -0700 | [diff] [blame] | 38 | -t|--t|--ta|--tag|--tags) |
| 39 | tags=t |
| 40 | ;; |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 41 | -n|--n|--no|--no-|--no-t|--no-ta|--no-tag|--no-tags) |
| 42 | no_tags=t |
| 43 | ;; |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 44 | -u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\ |
| 45 | --update-he|--update-hea|--update-head|--update-head-|\ |
| 46 | --update-head-o|--update-head-ok) |
| 47 | update_head_ok=t |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 48 | ;; |
Linus Torvalds | 583122c | 2005-11-18 08:31:55 -0800 | [diff] [blame] | 49 | -v|--verbose) |
| 50 | verbose=Yes |
| 51 | ;; |
Tom Prince | 0f76f52 | 2006-01-10 18:50:19 -0700 | [diff] [blame] | 52 | -k|--k|--ke|--kee|--keep) |
| 53 | keep=--keep |
| 54 | ;; |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 55 | --reflog-action=*) |
| 56 | rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'` |
| 57 | ;; |
freku045@student.liu.se | 87358b7 | 2005-12-13 23:30:31 +0100 | [diff] [blame] | 58 | -*) |
| 59 | usage |
| 60 | ;; |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 61 | *) |
| 62 | break |
| 63 | ;; |
| 64 | esac |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 65 | shift |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 66 | done |
| 67 | |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 68 | case "$#" in |
| 69 | 0) |
Junio C Hamano | 92c533e | 2005-08-20 03:00:03 -0700 | [diff] [blame] | 70 | test -f "$GIT_DIR/branches/origin" || |
| 71 | test -f "$GIT_DIR/remotes/origin" || |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 72 | die "Where do you want to fetch from today?" |
Junio C Hamano | 92c533e | 2005-08-20 03:00:03 -0700 | [diff] [blame] | 73 | set origin ;; |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 74 | esac |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 75 | |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 76 | remote_nick="$1" |
| 77 | remote=$(get_remote_url "$@") |
| 78 | refs= |
| 79 | rref= |
| 80 | rsync_slurped_objects= |
Linus Torvalds | 7ef7692 | 2005-05-22 11:03:24 -0700 | [diff] [blame] | 81 | |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 82 | rloga="$rloga $remote_nick" |
Eric Wong | ed0e078 | 2006-07-11 14:06:39 -0700 | [diff] [blame] | 83 | test "$remote_nick" = "$remote" || rloga="$rloga $remote" |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 84 | |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 85 | if test "" = "$append" |
| 86 | then |
Santi_Béjar | df34297 | 2005-10-05 18:58:10 +0200 | [diff] [blame] | 87 | : >"$GIT_DIR/FETCH_HEAD" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 88 | fi |
| 89 | |
| 90 | append_fetch_head () { |
| 91 | head_="$1" |
| 92 | remote_="$2" |
| 93 | remote_name_="$3" |
| 94 | remote_nick_="$4" |
| 95 | local_name_="$5" |
Junio C Hamano | 05dd8e2 | 2005-09-25 22:54:23 -0700 | [diff] [blame] | 96 | case "$6" in |
| 97 | t) not_for_merge_='not-for-merge' ;; |
| 98 | '') not_for_merge_= ;; |
| 99 | esac |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 100 | |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 101 | # remote-nick is the URL given on the command line (or a shorthand) |
| 102 | # remote-name is the $GIT_DIR relative refs/ path we computed |
| 103 | # for this refspec. |
Eric Wong | 687b8be | 2006-03-10 04:19:07 -0800 | [diff] [blame] | 104 | |
| 105 | # the $note_ variable will be fed to git-fmt-merge-msg for further |
| 106 | # processing. |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 107 | case "$remote_name_" in |
| 108 | HEAD) |
| 109 | note_= ;; |
| 110 | refs/heads/*) |
| 111 | note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')" |
Junio C Hamano | b91fb51 | 2005-09-21 13:59:54 -0700 | [diff] [blame] | 112 | note_="branch '$note_' of " ;; |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 113 | refs/tags/*) |
| 114 | note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')" |
Junio C Hamano | b91fb51 | 2005-09-21 13:59:54 -0700 | [diff] [blame] | 115 | note_="tag '$note_' of " ;; |
Eric Wong | 687b8be | 2006-03-10 04:19:07 -0800 | [diff] [blame] | 116 | refs/remotes/*) |
| 117 | note_="$(expr "$remote_name_" : 'refs/remotes/\(.*\)')" |
| 118 | note_="remote branch '$note_' of " ;; |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 119 | *) |
Junio C Hamano | b91fb51 | 2005-09-21 13:59:54 -0700 | [diff] [blame] | 120 | note_="$remote_name of " ;; |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 121 | esac |
Mark Wooding | f327dbc | 2006-04-13 22:01:24 +0000 | [diff] [blame] | 122 | remote_1_=$(expr "z$remote_" : 'z\(.*\)\.git/*$') && |
Junio C Hamano | b91fb51 | 2005-09-21 13:59:54 -0700 | [diff] [blame] | 123 | remote_="$remote_1_" |
| 124 | note_="$note_$remote_" |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 125 | |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 126 | # 2.6.11-tree tag would not be happy to be fed to resolve. |
| 127 | if git-cat-file commit "$head_" >/dev/null 2>&1 |
| 128 | then |
Junio C Hamano | 8572aa8 | 2005-08-24 22:46:07 -0700 | [diff] [blame] | 129 | headc_=$(git-rev-parse --verify "$head_^0") || exit |
Santi_Béjar | df34297 | 2005-10-05 18:58:10 +0200 | [diff] [blame] | 130 | echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD" |
Linus Torvalds | 583122c | 2005-11-18 08:31:55 -0800 | [diff] [blame] | 131 | [ "$verbose" ] && echo >&2 "* committish: $head_" |
| 132 | [ "$verbose" ] && echo >&2 " $note_" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 133 | else |
Santi_Béjar | df34297 | 2005-10-05 18:58:10 +0200 | [diff] [blame] | 134 | echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD" |
Linus Torvalds | 583122c | 2005-11-18 08:31:55 -0800 | [diff] [blame] | 135 | [ "$verbose" ] && echo >&2 "* non-commit: $head_" |
| 136 | [ "$verbose" ] && echo >&2 " $note_" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 137 | fi |
| 138 | if test "$local_name_" != "" |
| 139 | then |
| 140 | # We are storing the head locally. Make sure that it is |
| 141 | # a fast forward (aka "reverse push"). |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 142 | fast_forward_local "$local_name_" "$head_" "$note_" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 143 | fi |
| 144 | } |
| 145 | |
| 146 | fast_forward_local () { |
Junio C Hamano | 866ff2f | 2005-09-10 10:40:47 -0700 | [diff] [blame] | 147 | mkdir -p "$(dirname "$GIT_DIR/$1")" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 148 | case "$1" in |
| 149 | refs/tags/*) |
| 150 | # Tags need not be pointing at commits so there |
| 151 | # is no way to guarantee "fast-forward" anyway. |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 152 | if test -f "$GIT_DIR/$1" |
| 153 | then |
Junio C Hamano | f876579 | 2005-10-18 18:42:14 -0700 | [diff] [blame] | 154 | if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2" |
| 155 | then |
Sergey Vlasov | 7eae7b9 | 2006-07-14 19:06:57 +0400 | [diff] [blame^] | 156 | [ "$verbose" ] && echo >&2 "* $1: same as $3" ||: |
Junio C Hamano | f876579 | 2005-10-18 18:42:14 -0700 | [diff] [blame] | 157 | else |
| 158 | echo >&2 "* $1: updating with $3" |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 159 | git-update-ref -m "$rloga: updating tag" "$1" "$2" |
Junio C Hamano | f876579 | 2005-10-18 18:42:14 -0700 | [diff] [blame] | 160 | fi |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 161 | else |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 162 | echo >&2 "* $1: storing $3" |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 163 | git-update-ref -m "$rloga: storing tag" "$1" "$2" |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 164 | fi |
Junio C Hamano | bf7960e | 2005-09-27 18:14:27 -0700 | [diff] [blame] | 165 | ;; |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 166 | |
Eric Wong | 687b8be | 2006-03-10 04:19:07 -0800 | [diff] [blame] | 167 | refs/heads/* | refs/remotes/*) |
Junio C Hamano | bf7960e | 2005-09-27 18:14:27 -0700 | [diff] [blame] | 168 | # $1 is the ref being updated. |
| 169 | # $2 is the new value for the ref. |
| 170 | local=$(git-rev-parse --verify "$1^0" 2>/dev/null) |
| 171 | if test "$local" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 172 | then |
Junio C Hamano | bf7960e | 2005-09-27 18:14:27 -0700 | [diff] [blame] | 173 | # Require fast-forward. |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 174 | mb=$(git-merge-base "$local" "$2") && |
| 175 | case "$2,$mb" in |
| 176 | $local,*) |
Junio C Hamano | ea5aeb0 | 2006-06-03 23:44:40 -0700 | [diff] [blame] | 177 | if test -n "$verbose" |
| 178 | then |
| 179 | echo >&2 "* $1: same as $3" |
| 180 | fi |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 181 | ;; |
| 182 | *,$local) |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 183 | echo >&2 "* $1: fast forward to $3" |
Lukas Sandström | 9d7f73d | 2006-02-25 12:20:13 +0100 | [diff] [blame] | 184 | echo >&2 " from $local to $2" |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 185 | git-update-ref -m "$rloga: fast-forward" "$1" "$2" "$local" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 186 | ;; |
| 187 | *) |
| 188 | false |
| 189 | ;; |
| 190 | esac || { |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 191 | echo >&2 "* $1: does not fast forward to $3;" |
Junio C Hamano | bf7960e | 2005-09-27 18:14:27 -0700 | [diff] [blame] | 192 | case ",$force,$single_force," in |
| 193 | *,t,*) |
Junio C Hamano | 06ec2b4 | 2005-09-02 02:34:13 -0700 | [diff] [blame] | 194 | echo >&2 " forcing update." |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 195 | git-update-ref -m "$rloga: forced-update" "$1" "$2" "$local" |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 196 | ;; |
| 197 | *) |
Junio C Hamano | bf7960e | 2005-09-27 18:14:27 -0700 | [diff] [blame] | 198 | echo >&2 " not updating." |
Junio C Hamano | a9698bb | 2006-03-16 22:04:18 -0800 | [diff] [blame] | 199 | exit 1 |
Junio C Hamano | ae2da40 | 2005-08-22 21:28:33 -0700 | [diff] [blame] | 200 | ;; |
| 201 | esac |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 202 | } |
| 203 | else |
Junio C Hamano | bf7960e | 2005-09-27 18:14:27 -0700 | [diff] [blame] | 204 | echo >&2 "* $1: storing $3" |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 205 | git-update-ref -m "$rloga: storing head" "$1" "$2" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 206 | fi |
Linus Torvalds | 0a623e7 | 2005-07-05 11:38:37 -0700 | [diff] [blame] | 207 | ;; |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 208 | esac |
| 209 | } |
| 210 | |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 211 | case "$update_head_ok" in |
| 212 | '') |
Junio C Hamano | bf7960e | 2005-09-27 18:14:27 -0700 | [diff] [blame] | 213 | orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 214 | ;; |
| 215 | esac |
| 216 | |
Linus Torvalds | ed1aadf | 2005-09-29 14:35:15 -0700 | [diff] [blame] | 217 | # If --tags (and later --heads or --all) is specified, then we are |
| 218 | # not talking about defaults stored in Pull: line of remotes or |
| 219 | # branches file, and just fetch those and refspecs explicitly given. |
| 220 | # Otherwise we do what we always did. |
| 221 | |
| 222 | reflist=$(get_remote_refs_for_fetch "$@") |
| 223 | if test "$tags" |
| 224 | then |
Junio C Hamano | 878ccb2 | 2006-05-28 19:24:28 -0700 | [diff] [blame] | 225 | taglist=`IFS=" " && |
Michal Ostrowski | 96b086d | 2006-01-20 13:38:16 -0500 | [diff] [blame] | 226 | git-ls-remote $upload_pack --tags "$remote" | |
Junio C Hamano | 81214e4 | 2006-01-05 19:42:12 -0800 | [diff] [blame] | 227 | while read sha1 name |
| 228 | do |
| 229 | case "$name" in |
Junio C Hamano | 878ccb2 | 2006-05-28 19:24:28 -0700 | [diff] [blame] | 230 | *^*) continue ;; |
Junio C Hamano | 81214e4 | 2006-01-05 19:42:12 -0800 | [diff] [blame] | 231 | esac |
| 232 | if git-check-ref-format "$name" |
| 233 | then |
| 234 | echo ".${name}:${name}" |
| 235 | else |
| 236 | echo >&2 "warning: tag ${name} ignored" |
| 237 | fi |
Junio C Hamano | 878ccb2 | 2006-05-28 19:24:28 -0700 | [diff] [blame] | 238 | done` |
Linus Torvalds | ed1aadf | 2005-09-29 14:35:15 -0700 | [diff] [blame] | 239 | if test "$#" -gt 1 |
| 240 | then |
| 241 | # remote URL plus explicit refspecs; we need to merge them. |
Junio C Hamano | 221e743 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 242 | reflist="$reflist$LF$taglist" |
Linus Torvalds | ed1aadf | 2005-09-29 14:35:15 -0700 | [diff] [blame] | 243 | else |
| 244 | # No explicit refspecs; fetch tags only. |
| 245 | reflist=$taglist |
| 246 | fi |
| 247 | fi |
| 248 | |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 249 | fetch_main () { |
| 250 | reflist="$1" |
| 251 | refs= |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 252 | |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 253 | for ref in $reflist |
| 254 | do |
| 255 | refs="$refs$LF$ref" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 256 | |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 257 | # These are relative path from $GIT_DIR, typically starting at refs/ |
| 258 | # but may be HEAD |
Mark Wooding | f327dbc | 2006-04-13 22:01:24 +0000 | [diff] [blame] | 259 | if expr "z$ref" : 'z\.' >/dev/null |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 260 | then |
| 261 | not_for_merge=t |
Mark Wooding | f327dbc | 2006-04-13 22:01:24 +0000 | [diff] [blame] | 262 | ref=$(expr "z$ref" : 'z\.\(.*\)') |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 263 | else |
| 264 | not_for_merge= |
| 265 | fi |
Junio C Hamano | dfdcb55 | 2006-04-13 19:05:38 -0700 | [diff] [blame] | 266 | if expr "z$ref" : 'z+' >/dev/null |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 267 | then |
| 268 | single_force=t |
Junio C Hamano | dfdcb55 | 2006-04-13 19:05:38 -0700 | [diff] [blame] | 269 | ref=$(expr "z$ref" : 'z+\(.*\)') |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 270 | else |
| 271 | single_force= |
| 272 | fi |
Mark Wooding | f327dbc | 2006-04-13 22:01:24 +0000 | [diff] [blame] | 273 | remote_name=$(expr "z$ref" : 'z\([^:]*\):') |
| 274 | local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)') |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 275 | |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 276 | rref="$rref$LF$remote_name" |
Junio C Hamano | 4447bad | 2005-09-17 11:56:41 -0700 | [diff] [blame] | 277 | |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 278 | # There are transports that can fetch only one head at a time... |
| 279 | case "$remote" in |
| 280 | http://* | https://*) |
| 281 | if [ -n "$GIT_SSL_NO_VERIFY" ]; then |
| 282 | curl_extra_args="-k" |
| 283 | fi |
Nick Hengeveld | 093b068 | 2006-04-26 09:10:01 -0700 | [diff] [blame] | 284 | max_depth=5 |
| 285 | depth=0 |
| 286 | head="ref: $remote_name" |
| 287 | while (expr "z$head" : "zref:" && expr $depth \< $max_depth) >/dev/null |
| 288 | do |
Michal Rokos | d9bffc0 | 2006-07-08 17:32:04 +0200 | [diff] [blame] | 289 | remote_name_quoted=$(@@PERL@@ -e ' |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 290 | my $u = $ARGV[0]; |
Nick Hengeveld | 093b068 | 2006-04-26 09:10:01 -0700 | [diff] [blame] | 291 | $u =~ s/^ref:\s*//; |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 292 | $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg; |
| 293 | print "$u"; |
Nick Hengeveld | 093b068 | 2006-04-26 09:10:01 -0700 | [diff] [blame] | 294 | ' "$head") |
| 295 | head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") |
| 296 | depth=$( expr \( $depth + 1 \) ) |
| 297 | done |
Mark Wooding | f327dbc | 2006-04-13 22:01:24 +0000 | [diff] [blame] | 298 | expr "z$head" : "z$_x40\$" >/dev/null || |
Nick Hengeveld | 093b068 | 2006-04-26 09:10:01 -0700 | [diff] [blame] | 299 | die "Failed to fetch $remote_name from $remote" |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 300 | echo >&2 Fetching "$remote_name from $remote" using http |
| 301 | git-http-fetch -v -a "$head" "$remote/" || exit |
| 302 | ;; |
| 303 | rsync://*) |
| 304 | TMP_HEAD="$GIT_DIR/TMP_HEAD" |
| 305 | rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1 |
| 306 | head=$(git-rev-parse --verify TMP_HEAD) |
| 307 | rm -f "$TMP_HEAD" |
| 308 | test "$rsync_slurped_objects" || { |
| 309 | rsync -av --ignore-existing --exclude info \ |
| 310 | "$remote/objects/" "$GIT_OBJECT_DIRECTORY/" || exit |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 311 | |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 312 | # Look at objects/info/alternates for rsync -- http will |
| 313 | # support it natively and git native ones will do it on |
| 314 | # the remote end. Not having that file is not a crime. |
| 315 | rsync -q "$remote/objects/info/alternates" \ |
| 316 | "$GIT_DIR/TMP_ALT" 2>/dev/null || |
| 317 | rm -f "$GIT_DIR/TMP_ALT" |
| 318 | if test -f "$GIT_DIR/TMP_ALT" |
| 319 | then |
| 320 | resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" | |
| 321 | while read alt |
| 322 | do |
| 323 | case "$alt" in 'bad alternate: '*) die "$alt";; esac |
| 324 | echo >&2 "Getting alternate: $alt" |
| 325 | rsync -av --ignore-existing --exclude info \ |
| 326 | "$alt" "$GIT_OBJECT_DIRECTORY/" || exit |
| 327 | done |
| 328 | rm -f "$GIT_DIR/TMP_ALT" |
| 329 | fi |
| 330 | rsync_slurped_objects=t |
| 331 | } |
| 332 | ;; |
| 333 | *) |
| 334 | # We will do git native transport with just one call later. |
| 335 | continue ;; |
| 336 | esac |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 337 | |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 338 | append_fetch_head "$head" "$remote" \ |
| 339 | "$remote_name" "$remote_nick" "$local_name" "$not_for_merge" |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 340 | |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 341 | done |
| 342 | |
| 343 | case "$remote" in |
| 344 | http://* | https://* | rsync://* ) |
| 345 | ;; # we are already done. |
| 346 | *) |
| 347 | ( : subshell because we muck with IFS |
| 348 | IFS=" $LF" |
| 349 | ( |
Junio C Hamano | b19696c | 2006-02-20 00:38:39 -0800 | [diff] [blame] | 350 | git-fetch-pack $exec $keep --thin "$remote" $rref || echo failed "$remote" |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 351 | ) | |
| 352 | while read sha1 remote_name |
| 353 | do |
| 354 | case "$sha1" in |
| 355 | failed) |
| 356 | echo >&2 "Fetch failure: $remote" |
| 357 | exit 1 ;; |
| 358 | esac |
| 359 | found= |
| 360 | single_force= |
| 361 | for ref in $refs |
| 362 | do |
| 363 | case "$ref" in |
| 364 | +$remote_name:*) |
| 365 | single_force=t |
| 366 | not_for_merge= |
| 367 | found="$ref" |
| 368 | break ;; |
| 369 | .+$remote_name:*) |
| 370 | single_force=t |
| 371 | not_for_merge=t |
| 372 | found="$ref" |
| 373 | break ;; |
| 374 | .$remote_name:*) |
| 375 | not_for_merge=t |
| 376 | found="$ref" |
| 377 | break ;; |
| 378 | $remote_name:*) |
| 379 | not_for_merge= |
| 380 | found="$ref" |
| 381 | break ;; |
| 382 | esac |
| 383 | done |
Mark Wooding | f327dbc | 2006-04-13 22:01:24 +0000 | [diff] [blame] | 384 | local_name=$(expr "z$found" : 'z[^:]*:\(.*\)') |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 385 | append_fetch_head "$sha1" "$remote" \ |
| 386 | "$remote_name" "$remote_nick" "$local_name" "$not_for_merge" |
| 387 | done |
| 388 | ) || exit ;; |
| 389 | esac |
| 390 | |
| 391 | } |
| 392 | |
| 393 | fetch_main "$reflist" |
| 394 | |
| 395 | # automated tag following |
| 396 | case "$no_tags$tags" in |
| 397 | '') |
Junio C Hamano | 6dc78e6 | 2006-02-22 13:10:37 -0800 | [diff] [blame] | 398 | case "$reflist" in |
| 399 | *:refs/*) |
| 400 | # effective only when we are following remote branch |
| 401 | # using local tracking branch. |
| 402 | taglist=$(IFS=" " && |
| 403 | git-ls-remote $upload_pack --tags "$remote" | |
| 404 | sed -ne 's|^\([0-9a-f]*\)[ ]\(refs/tags/.*\)^{}$|\1 \2|p' | |
| 405 | while read sha1 name |
| 406 | do |
| 407 | test -f "$GIT_DIR/$name" && continue |
| 408 | git-check-ref-format "$name" || { |
| 409 | echo >&2 "warning: tag ${name} ignored" |
| 410 | continue |
| 411 | } |
| 412 | git-cat-file -t "$sha1" >/dev/null 2>&1 || continue |
| 413 | echo >&2 "Auto-following $name" |
| 414 | echo ".${name}:${name}" |
| 415 | done) |
| 416 | esac |
Junio C Hamano | 03febf9 | 2006-01-07 00:48:04 -0800 | [diff] [blame] | 417 | case "$taglist" in |
| 418 | '') ;; |
| 419 | ?*) |
| 420 | fetch_main "$taglist" ;; |
| 421 | esac |
Junio C Hamano | 853a369 | 2005-08-20 02:54:34 -0700 | [diff] [blame] | 422 | esac |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 423 | |
| 424 | # If the original head was empty (i.e. no "master" yet), or |
| 425 | # if we were told not to worry, we do not have to check. |
| 426 | case ",$update_head_ok,$orig_head," in |
| 427 | *,, | t,* ) |
| 428 | ;; |
| 429 | *) |
Junio C Hamano | bf7960e | 2005-09-27 18:14:27 -0700 | [diff] [blame] | 430 | curr_head=$(git-rev-parse --verify HEAD 2>/dev/null) |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 431 | if test "$curr_head" != "$orig_head" |
| 432 | then |
Shawn Pearce | 55b7835 | 2006-07-10 23:38:35 -0400 | [diff] [blame] | 433 | git-update-ref \ |
| 434 | -m "$rloga: Undoing incorrectly fetched HEAD." \ |
| 435 | HEAD "$orig_head" |
Junio C Hamano | b10ac50 | 2005-08-25 18:15:32 -0700 | [diff] [blame] | 436 | die "Cannot fetch into the current branch." |
| 437 | fi |
| 438 | ;; |
| 439 | esac |