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