Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # Copyright (c) 2006, Junio C Hamano. |
| 3 | |
| 4 | test_description='Per branch config variables affects "git fetch". |
| 5 | |
| 6 | ' |
| 7 | |
| 8 | . ./test-lib.sh |
| 9 | |
Elia Pinto | a9d32be | 2015-12-23 14:45:55 +0100 | [diff] [blame] | 10 | D=$(pwd) |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 11 | |
Junio C Hamano | 2e674a9 | 2009-08-07 20:12:13 -0700 | [diff] [blame] | 12 | test_bundle_object_count () { |
| 13 | git verify-pack -v "$1" >verify.out && |
brian m. carlson | ba1be1a | 2019-12-21 19:49:29 +0000 | [diff] [blame] | 14 | test "$2" = $(grep "^$OID_REGEX " verify.out | wc -l) |
Junio C Hamano | 2e674a9 | 2009-08-07 20:12:13 -0700 | [diff] [blame] | 15 | } |
| 16 | |
Thomas Rast | 61821aa | 2012-03-01 22:40:48 +0100 | [diff] [blame] | 17 | convert_bundle_to_pack () { |
| 18 | while read x && test -n "$x" |
| 19 | do |
| 20 | :; |
| 21 | done |
| 22 | cat |
| 23 | } |
| 24 | |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 25 | test_expect_success setup ' |
| 26 | echo >file original && |
| 27 | git add file && |
| 28 | git commit -a -m original' |
| 29 | |
| 30 | test_expect_success "clone and setup child repos" ' |
| 31 | git clone . one && |
Jonathan Nieder | 18a8269 | 2010-09-06 20:42:54 -0500 | [diff] [blame] | 32 | ( |
| 33 | cd one && |
| 34 | echo >file updated by one && |
| 35 | git commit -a -m "updated by one" |
Jens Lehmann | fd4ec4f | 2010-09-06 20:39:54 +0200 | [diff] [blame] | 36 | ) && |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 37 | git clone . two && |
Jonathan Nieder | 18a8269 | 2010-09-06 20:42:54 -0500 | [diff] [blame] | 38 | ( |
| 39 | cd two && |
| 40 | git config branch.master.remote one && |
| 41 | git config remote.one.url ../one/.git/ && |
| 42 | git config remote.one.fetch refs/heads/master:refs/heads/one |
Jens Lehmann | fd4ec4f | 2010-09-06 20:39:54 +0200 | [diff] [blame] | 43 | ) && |
Santi Béjar | 6cc7c36 | 2006-09-23 22:55:35 +0200 | [diff] [blame] | 44 | git clone . three && |
Jonathan Nieder | 18a8269 | 2010-09-06 20:42:54 -0500 | [diff] [blame] | 45 | ( |
| 46 | cd three && |
| 47 | git config branch.master.remote two && |
| 48 | git config branch.master.merge refs/heads/one && |
| 49 | mkdir -p .git/remotes && |
| 50 | { |
| 51 | echo "URL: ../two/.git/" |
| 52 | echo "Pull: refs/heads/master:refs/heads/two" |
| 53 | echo "Pull: refs/heads/one:refs/heads/one" |
| 54 | } >.git/remotes/two |
Jens Lehmann | fd4ec4f | 2010-09-06 20:39:54 +0200 | [diff] [blame] | 55 | ) && |
Jeff King | 9a7bbd1 | 2008-06-16 12:15:02 -0400 | [diff] [blame] | 56 | git clone . bundle && |
| 57 | git clone . seven |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 58 | ' |
| 59 | |
| 60 | test_expect_success "fetch test" ' |
| 61 | cd "$D" && |
| 62 | echo >file updated by origin && |
| 63 | git commit -a -m "updated by origin" && |
| 64 | cd two && |
| 65 | git fetch && |
David Turner | cbc5cf7 | 2018-05-23 07:25:17 +0200 | [diff] [blame] | 66 | git rev-parse --verify refs/heads/one && |
Elia Pinto | a9d32be | 2015-12-23 14:45:55 +0100 | [diff] [blame] | 67 | mine=$(git rev-parse refs/heads/one) && |
| 68 | his=$(cd ../one && git rev-parse refs/heads/master) && |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 69 | test "z$mine" = "z$his" |
| 70 | ' |
| 71 | |
Santi Béjar | 6cc7c36 | 2006-09-23 22:55:35 +0200 | [diff] [blame] | 72 | test_expect_success "fetch test for-merge" ' |
| 73 | cd "$D" && |
| 74 | cd three && |
| 75 | git fetch && |
David Turner | cbc5cf7 | 2018-05-23 07:25:17 +0200 | [diff] [blame] | 76 | git rev-parse --verify refs/heads/two && |
| 77 | git rev-parse --verify refs/heads/one && |
Elia Pinto | a9d32be | 2015-12-23 14:45:55 +0100 | [diff] [blame] | 78 | master_in_two=$(cd ../two && git rev-parse master) && |
| 79 | one_in_two=$(cd ../two && git rev-parse one) && |
Santi Béjar | 6cc7c36 | 2006-09-23 22:55:35 +0200 | [diff] [blame] | 80 | { |
Santi Béjar | 6cc7c36 | 2006-09-23 22:55:35 +0200 | [diff] [blame] | 81 | echo "$one_in_two " |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 82 | echo "$master_in_two not-for-merge" |
Santi Béjar | 6cc7c36 | 2006-09-23 22:55:35 +0200 | [diff] [blame] | 83 | } >expected && |
| 84 | cut -f -2 .git/FETCH_HEAD >actual && |
Gary V. Vaughan | 4fdf71b | 2010-05-14 09:31:37 +0000 | [diff] [blame] | 85 | test_cmp expected actual' |
Santi Béjar | 6cc7c36 | 2006-09-23 22:55:35 +0200 | [diff] [blame] | 86 | |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 87 | test_expect_success 'fetch --prune on its own works as expected' ' |
| 88 | cd "$D" && |
| 89 | git clone . prune && |
| 90 | cd prune && |
Michael Haggerty | d0d06e8 | 2013-10-23 17:50:35 +0200 | [diff] [blame] | 91 | git update-ref refs/remotes/origin/extrabranch master && |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 92 | |
| 93 | git fetch --prune origin && |
| 94 | test_must_fail git rev-parse origin/extrabranch |
| 95 | ' |
| 96 | |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 97 | test_expect_success 'fetch --prune with a branch name keeps branches' ' |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 98 | cd "$D" && |
| 99 | git clone . prune-branch && |
| 100 | cd prune-branch && |
Michael Haggerty | d0d06e8 | 2013-10-23 17:50:35 +0200 | [diff] [blame] | 101 | git update-ref refs/remotes/origin/extrabranch master && |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 102 | |
| 103 | git fetch --prune origin master && |
| 104 | git rev-parse origin/extrabranch |
| 105 | ' |
| 106 | |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 107 | test_expect_success 'fetch --prune with a namespace keeps other namespaces' ' |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 108 | cd "$D" && |
| 109 | git clone . prune-namespace && |
| 110 | cd prune-namespace && |
| 111 | |
| 112 | git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* && |
| 113 | git rev-parse origin/master |
| 114 | ' |
| 115 | |
Carlos Martín Nieto | e6f6371 | 2014-02-27 10:00:10 +0100 | [diff] [blame] | 116 | test_expect_success 'fetch --prune handles overlapping refspecs' ' |
Carlos Martín Nieto | f377e7a | 2014-02-27 10:00:09 +0100 | [diff] [blame] | 117 | cd "$D" && |
| 118 | git update-ref refs/pull/42/head master && |
| 119 | git clone . prune-overlapping && |
| 120 | cd prune-overlapping && |
| 121 | git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* && |
| 122 | |
| 123 | git fetch --prune origin && |
| 124 | git rev-parse origin/master && |
| 125 | git rev-parse origin/pr/42 && |
| 126 | |
Jeff King | 8fb2687 | 2015-03-20 06:06:15 -0400 | [diff] [blame] | 127 | git config --unset-all remote.origin.fetch && |
Carlos Martín Nieto | f377e7a | 2014-02-27 10:00:09 +0100 | [diff] [blame] | 128 | git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* && |
| 129 | git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* && |
| 130 | |
| 131 | git fetch --prune origin && |
| 132 | git rev-parse origin/master && |
| 133 | git rev-parse origin/pr/42 |
| 134 | ' |
| 135 | |
Michael Haggerty | 0838bf4 | 2013-10-30 06:33:00 +0100 | [diff] [blame] | 136 | test_expect_success 'fetch --prune --tags prunes branches but not tags' ' |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 137 | cd "$D" && |
| 138 | git clone . prune-tags && |
| 139 | cd prune-tags && |
Michael Haggerty | d0d06e8 | 2013-10-23 17:50:35 +0200 | [diff] [blame] | 140 | git tag sometag master && |
Michael Haggerty | 68a304d | 2013-10-23 17:50:36 +0200 | [diff] [blame] | 141 | # Create what looks like a remote-tracking branch from an earlier |
| 142 | # fetch that has since been deleted from the remote: |
| 143 | git update-ref refs/remotes/origin/fake-remote master && |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 144 | |
| 145 | git fetch --prune --tags origin && |
| 146 | git rev-parse origin/master && |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 147 | test_must_fail git rev-parse origin/fake-remote && |
Michael Haggerty | 0838bf4 | 2013-10-30 06:33:00 +0100 | [diff] [blame] | 148 | git rev-parse sometag |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 149 | ' |
| 150 | |
Michael Haggerty | 0838bf4 | 2013-10-30 06:33:00 +0100 | [diff] [blame] | 151 | test_expect_success 'fetch --prune --tags with branch does not prune other things' ' |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 152 | cd "$D" && |
| 153 | git clone . prune-tags-branch && |
| 154 | cd prune-tags-branch && |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 155 | git tag sometag master && |
Michael Haggerty | d0d06e8 | 2013-10-23 17:50:35 +0200 | [diff] [blame] | 156 | git update-ref refs/remotes/origin/extrabranch master && |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 157 | |
| 158 | git fetch --prune --tags origin master && |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 159 | git rev-parse origin/extrabranch && |
Michael Haggerty | 0838bf4 | 2013-10-30 06:33:00 +0100 | [diff] [blame] | 160 | git rev-parse sometag |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 161 | ' |
| 162 | |
| 163 | test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' ' |
| 164 | cd "$D" && |
| 165 | git clone . prune-tags-refspec && |
| 166 | cd prune-tags-refspec && |
| 167 | git tag sometag master && |
| 168 | git update-ref refs/remotes/origin/foo/otherbranch master && |
| 169 | git update-ref refs/remotes/origin/extrabranch master && |
| 170 | |
| 171 | git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* && |
| 172 | test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch && |
| 173 | git rev-parse origin/extrabranch && |
Michael Haggerty | 0838bf4 | 2013-10-30 06:33:00 +0100 | [diff] [blame] | 174 | git rev-parse sometag |
Carlos Martín Nieto | 43a8a04 | 2011-10-08 00:51:07 +0200 | [diff] [blame] | 175 | ' |
| 176 | |
Derrick Stolee | b40a502 | 2020-01-21 01:38:12 +0000 | [diff] [blame] | 177 | test_expect_success '--refmap="" ignores configured refspec' ' |
| 178 | cd "$TRASH_DIRECTORY" && |
| 179 | git clone "$D" remote-refs && |
| 180 | git -C remote-refs rev-parse remotes/origin/master >old && |
| 181 | git -C remote-refs update-ref refs/remotes/origin/master master~1 && |
| 182 | git -C remote-refs rev-parse remotes/origin/master >new && |
| 183 | git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" && |
| 184 | git -C remote-refs rev-parse remotes/origin/master >actual && |
| 185 | test_cmp new actual && |
| 186 | git -C remote-refs fetch origin && |
| 187 | git -C remote-refs rev-parse remotes/origin/master >actual && |
| 188 | test_cmp old actual |
| 189 | ' |
| 190 | |
| 191 | test_expect_success '--refmap="" and --prune' ' |
| 192 | git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch master && |
| 193 | git -C remote-refs update-ref refs/hidden/foo/otherbranch master && |
| 194 | git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* && |
| 195 | git -C remote-refs rev-parse remotes/origin/foo/otherbranch && |
| 196 | test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch && |
| 197 | git -C remote-refs fetch --prune origin && |
| 198 | test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch |
| 199 | ' |
| 200 | |
Väinö Järvelä | f539d0d | 2007-10-09 11:51:07 +0300 | [diff] [blame] | 201 | test_expect_success 'fetch tags when there is no tags' ' |
| 202 | |
| 203 | cd "$D" && |
| 204 | |
| 205 | mkdir notags && |
| 206 | cd notags && |
| 207 | git init && |
| 208 | |
| 209 | git fetch -t .. |
| 210 | |
| 211 | ' |
| 212 | |
Junio C Hamano | 6c96c0f | 2006-11-18 21:39:17 -0800 | [diff] [blame] | 213 | test_expect_success 'fetch following tags' ' |
| 214 | |
| 215 | cd "$D" && |
| 216 | git tag -a -m 'annotated' anno HEAD && |
| 217 | git tag light HEAD && |
| 218 | |
| 219 | mkdir four && |
| 220 | cd four && |
Nicolas Pitre | 5c94f87 | 2007-01-12 16:01:46 -0500 | [diff] [blame] | 221 | git init && |
Junio C Hamano | 6c96c0f | 2006-11-18 21:39:17 -0800 | [diff] [blame] | 222 | |
| 223 | git fetch .. :track && |
| 224 | git show-ref --verify refs/tags/anno && |
| 225 | git show-ref --verify refs/tags/light |
| 226 | |
| 227 | ' |
| 228 | |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 229 | test_expect_success 'fetch uses remote ref names to describe new refs' ' |
| 230 | cd "$D" && |
| 231 | git init descriptive && |
| 232 | ( |
| 233 | cd descriptive && |
| 234 | git config remote.o.url .. && |
| 235 | git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" && |
| 236 | git config --add remote.o.fetch "refs/others/*:refs/heads/*" && |
| 237 | git fetch o |
| 238 | ) && |
| 239 | git tag -a -m "Descriptive tag" descriptive-tag && |
| 240 | git branch descriptive-branch && |
| 241 | git checkout descriptive-branch && |
| 242 | echo "Nuts" >crazy && |
| 243 | git add crazy && |
| 244 | git commit -a -m "descriptive commit" && |
| 245 | git update-ref refs/others/crazy HEAD && |
| 246 | ( |
| 247 | cd descriptive && |
| 248 | git fetch o 2>actual && |
SZEDER Gábor | 927c1a6 | 2018-02-08 16:56:52 +0100 | [diff] [blame] | 249 | test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual && |
| 250 | test_i18ngrep "new tag.* -> descriptive-tag$" actual && |
| 251 | test_i18ngrep "new ref.* -> crazy$" actual |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 252 | ) && |
| 253 | git checkout master |
| 254 | ' |
| 255 | |
Junio C Hamano | 41ac414 | 2008-02-01 01:50:53 -0800 | [diff] [blame] | 256 | test_expect_success 'fetch must not resolve short tag name' ' |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 257 | |
| 258 | cd "$D" && |
| 259 | |
| 260 | mkdir five && |
| 261 | cd five && |
| 262 | git init && |
| 263 | |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 264 | test_must_fail git fetch .. anno:five |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 265 | |
| 266 | ' |
| 267 | |
Junio C Hamano | dd621df | 2011-11-04 14:14:05 -0700 | [diff] [blame] | 268 | test_expect_success 'fetch can now resolve short remote name' ' |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 269 | |
| 270 | cd "$D" && |
Jonathan Nieder | a48fcd8 | 2010-10-30 20:46:54 -0500 | [diff] [blame] | 271 | git update-ref refs/remotes/six/HEAD HEAD && |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 272 | |
| 273 | mkdir six && |
| 274 | cd six && |
| 275 | git init && |
| 276 | |
Junio C Hamano | dd621df | 2011-11-04 14:14:05 -0700 | [diff] [blame] | 277 | git fetch .. six:six |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 278 | ' |
| 279 | |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 280 | test_expect_success 'create bundle 1' ' |
| 281 | cd "$D" && |
| 282 | echo >file updated again by origin && |
| 283 | git commit -a -m "tip" && |
brian m. carlson | c5aecfc | 2020-07-29 23:14:20 +0000 | [diff] [blame] | 284 | git bundle create --version=3 bundle1 master^..master |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 285 | ' |
| 286 | |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 287 | test_expect_success 'header of bundle looks right' ' |
brian m. carlson | c5aecfc | 2020-07-29 23:14:20 +0000 | [diff] [blame] | 288 | cat >expect <<-EOF && |
| 289 | # v3 git bundle |
| 290 | @object-format=$(test_oid algo) |
| 291 | -OID updated by origin |
| 292 | OID refs/heads/master |
| 293 | |
| 294 | EOF |
| 295 | sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual && |
| 296 | test_cmp expect actual |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 297 | ' |
| 298 | |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 299 | test_expect_success 'create bundle 2' ' |
| 300 | cd "$D" && |
| 301 | git bundle create bundle2 master~2..master |
| 302 | ' |
| 303 | |
Junio C Hamano | 41ac414 | 2008-02-01 01:50:53 -0800 | [diff] [blame] | 304 | test_expect_success 'unbundle 1' ' |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 305 | cd "$D/bundle" && |
| 306 | git checkout -b some-branch && |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 307 | test_must_fail git fetch "$D/bundle1" master:master |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 308 | ' |
| 309 | |
Junio C Hamano | 2e674a9 | 2009-08-07 20:12:13 -0700 | [diff] [blame] | 310 | |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 311 | test_expect_success 'bundle 1 has only 3 files ' ' |
| 312 | cd "$D" && |
Thomas Rast | 61821aa | 2012-03-01 22:40:48 +0100 | [diff] [blame] | 313 | convert_bundle_to_pack <bundle1 >bundle.pack && |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 314 | git index-pack bundle.pack && |
Junio C Hamano | 2e674a9 | 2009-08-07 20:12:13 -0700 | [diff] [blame] | 315 | test_bundle_object_count bundle.pack 3 |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 316 | ' |
| 317 | |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 318 | test_expect_success 'unbundle 2' ' |
| 319 | cd "$D/bundle" && |
| 320 | git fetch ../bundle2 master:master && |
brian m. carlson | ba1be1a | 2019-12-21 19:49:29 +0000 | [diff] [blame] | 321 | test "tip" = "$(git log -1 --pretty=oneline master | cut -d" " -f2)" |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 322 | ' |
| 323 | |
Johannes Schindelin | 18449ab | 2007-03-08 00:43:05 +0100 | [diff] [blame] | 324 | test_expect_success 'bundle does not prerequisite objects' ' |
| 325 | cd "$D" && |
| 326 | touch file2 && |
| 327 | git add file2 && |
| 328 | git commit -m add.file2 file2 && |
| 329 | git bundle create bundle3 -1 HEAD && |
Thomas Rast | 61821aa | 2012-03-01 22:40:48 +0100 | [diff] [blame] | 330 | convert_bundle_to_pack <bundle3 >bundle.pack && |
Johannes Schindelin | 18449ab | 2007-03-08 00:43:05 +0100 | [diff] [blame] | 331 | git index-pack bundle.pack && |
Junio C Hamano | 2e674a9 | 2009-08-07 20:12:13 -0700 | [diff] [blame] | 332 | test_bundle_object_count bundle.pack 3 |
Johannes Schindelin | 18449ab | 2007-03-08 00:43:05 +0100 | [diff] [blame] | 333 | ' |
| 334 | |
Junio C Hamano | 7fa8254 | 2007-08-08 17:01:49 -0700 | [diff] [blame] | 335 | test_expect_success 'bundle should be able to create a full history' ' |
| 336 | |
| 337 | cd "$D" && |
| 338 | git tag -a -m '1.0' v1.0 master && |
| 339 | git bundle create bundle4 v1.0 |
| 340 | |
| 341 | ' |
| 342 | |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 343 | test_expect_success 'fetch with a non-applying branch.<name>.merge' ' |
| 344 | git config branch.master.remote yeti && |
| 345 | git config branch.master.merge refs/heads/bigfoot && |
| 346 | git config remote.blub.url one && |
| 347 | git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" && |
| 348 | git fetch blub |
| 349 | ' |
| 350 | |
Brandon Casey | 042cca3 | 2010-09-09 13:56:37 -0500 | [diff] [blame] | 351 | # URL supplied to fetch does not match the url of the configured branch's remote |
| 352 | test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' ' |
| 353 | one_head=$(cd one && git rev-parse HEAD) && |
| 354 | this_head=$(git rev-parse HEAD) && |
Brandon Casey | 6106ce4 | 2010-08-25 12:52:55 -0500 | [diff] [blame] | 355 | git update-ref -d FETCH_HEAD && |
| 356 | git fetch one && |
Brandon Casey | 042cca3 | 2010-09-09 13:56:37 -0500 | [diff] [blame] | 357 | test $one_head = "$(git rev-parse --verify FETCH_HEAD)" && |
| 358 | test $this_head = "$(git rev-parse --verify HEAD)" |
| 359 | ' |
| 360 | |
| 361 | # URL supplied to fetch matches the url of the configured branch's remote and |
| 362 | # the merge spec matches the branch the remote HEAD points to |
| 363 | test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' ' |
| 364 | one_ref=$(cd one && git symbolic-ref HEAD) && |
| 365 | git config branch.master.remote blub && |
| 366 | git config branch.master.merge "$one_ref" && |
| 367 | git update-ref -d FETCH_HEAD && |
| 368 | git fetch one && |
| 369 | test $one_head = "$(git rev-parse --verify FETCH_HEAD)" && |
| 370 | test $this_head = "$(git rev-parse --verify HEAD)" |
| 371 | ' |
| 372 | |
| 373 | # URL supplied to fetch matches the url of the configured branch's remote, but |
| 374 | # the merge spec does not match the branch the remote HEAD points to |
| 375 | test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' ' |
| 376 | git config branch.master.merge "${one_ref}_not" && |
| 377 | git update-ref -d FETCH_HEAD && |
| 378 | git fetch one && |
| 379 | test $one_head = "$(git rev-parse --verify FETCH_HEAD)" && |
| 380 | test $this_head = "$(git rev-parse --verify HEAD)" |
Brandon Casey | 6106ce4 | 2010-08-25 12:52:55 -0500 | [diff] [blame] | 381 | ' |
| 382 | |
Johannes Sixt | c2015b3 | 2007-11-04 21:26:22 +0100 | [diff] [blame] | 383 | # the strange name is: a\!'b |
| 384 | test_expect_success 'quoting of a strangely named repo' ' |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 385 | test_must_fail git fetch "a\\!'\''b" > result 2>&1 && |
Johannes Sixt | c2015b3 | 2007-11-04 21:26:22 +0100 | [diff] [blame] | 386 | grep "fatal: '\''a\\\\!'\''b'\''" result |
| 387 | ' |
| 388 | |
Johannes Schindelin | c5546e8 | 2007-11-22 12:24:59 +0000 | [diff] [blame] | 389 | test_expect_success 'bundle should record HEAD correctly' ' |
| 390 | |
| 391 | cd "$D" && |
| 392 | git bundle create bundle5 HEAD master && |
| 393 | git bundle list-heads bundle5 >actual && |
| 394 | for h in HEAD refs/heads/master |
| 395 | do |
| 396 | echo "$(git rev-parse --verify $h) $h" |
| 397 | done >expect && |
Jeff King | 82ebb0b | 2008-03-12 17:36:36 -0400 | [diff] [blame] | 398 | test_cmp expect actual |
Johannes Schindelin | c5546e8 | 2007-11-22 12:24:59 +0000 | [diff] [blame] | 399 | |
| 400 | ' |
| 401 | |
Jeff King | 51f8c81 | 2013-05-11 18:14:03 +0200 | [diff] [blame] | 402 | test_expect_success 'mark initial state of origin/master' ' |
| 403 | ( |
| 404 | cd three && |
| 405 | git tag base-origin-master refs/remotes/origin/master |
| 406 | ) |
| 407 | ' |
| 408 | |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 409 | test_expect_success 'explicit fetch should update tracking' ' |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 410 | |
| 411 | cd "$D" && |
| 412 | git branch -f side && |
| 413 | ( |
| 414 | cd three && |
Jeff King | 51f8c81 | 2013-05-11 18:14:03 +0200 | [diff] [blame] | 415 | git update-ref refs/remotes/origin/master base-origin-master && |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 416 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 417 | git fetch origin master && |
| 418 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 419 | test "$o" != "$n" && |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 420 | test_must_fail git rev-parse --verify refs/remotes/origin/side |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 421 | ) |
| 422 | ' |
| 423 | |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 424 | test_expect_success 'explicit pull should update tracking' ' |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 425 | |
| 426 | cd "$D" && |
| 427 | git branch -f side && |
| 428 | ( |
| 429 | cd three && |
Jeff King | 51f8c81 | 2013-05-11 18:14:03 +0200 | [diff] [blame] | 430 | git update-ref refs/remotes/origin/master base-origin-master && |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 431 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 432 | git pull origin master && |
| 433 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 434 | test "$o" != "$n" && |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 435 | test_must_fail git rev-parse --verify refs/remotes/origin/side |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 436 | ) |
| 437 | ' |
| 438 | |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 439 | test_expect_success 'explicit --refmap is allowed only with command-line refspec' ' |
| 440 | cd "$D" && |
| 441 | ( |
| 442 | cd three && |
| 443 | test_must_fail git fetch --refmap="*:refs/remotes/none/*" |
| 444 | ) |
| 445 | ' |
| 446 | |
| 447 | test_expect_success 'explicit --refmap option overrides remote.*.fetch' ' |
| 448 | cd "$D" && |
| 449 | git branch -f side && |
| 450 | ( |
| 451 | cd three && |
| 452 | git update-ref refs/remotes/origin/master base-origin-master && |
| 453 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 454 | git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master && |
| 455 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
| 456 | test "$o" = "$n" && |
| 457 | test_must_fail git rev-parse --verify refs/remotes/origin/side && |
| 458 | git rev-parse --verify refs/remotes/other/master |
| 459 | ) |
| 460 | ' |
| 461 | |
| 462 | test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' ' |
| 463 | cd "$D" && |
| 464 | git branch -f side && |
| 465 | ( |
| 466 | cd three && |
| 467 | git update-ref refs/remotes/origin/master base-origin-master && |
| 468 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 469 | git fetch --refmap="" origin master && |
| 470 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
| 471 | test "$o" = "$n" && |
| 472 | test_must_fail git rev-parse --verify refs/remotes/origin/side |
| 473 | ) |
| 474 | ' |
| 475 | |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 476 | test_expect_success 'configured fetch updates tracking' ' |
| 477 | |
| 478 | cd "$D" && |
| 479 | git branch -f side && |
| 480 | ( |
| 481 | cd three && |
Jeff King | 51f8c81 | 2013-05-11 18:14:03 +0200 | [diff] [blame] | 482 | git update-ref refs/remotes/origin/master base-origin-master && |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 483 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 484 | git fetch origin && |
| 485 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
| 486 | test "$o" != "$n" && |
| 487 | git rev-parse --verify refs/remotes/origin/side |
| 488 | ) |
| 489 | ' |
| 490 | |
John Keeping | 823c6d5 | 2013-05-27 17:33:09 +0100 | [diff] [blame] | 491 | test_expect_success 'non-matching refspecs do not confuse tracking update' ' |
| 492 | cd "$D" && |
| 493 | git update-ref refs/odd/location HEAD && |
| 494 | ( |
| 495 | cd three && |
| 496 | git update-ref refs/remotes/origin/master base-origin-master && |
| 497 | git config --add remote.origin.fetch \ |
| 498 | refs/odd/location:refs/remotes/origin/odd && |
| 499 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 500 | git fetch origin master && |
| 501 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
| 502 | test "$o" != "$n" && |
| 503 | test_must_fail git rev-parse --verify refs/remotes/origin/odd |
| 504 | ) |
| 505 | ' |
| 506 | |
Jeff King | 9a7bbd1 | 2008-06-16 12:15:02 -0400 | [diff] [blame] | 507 | test_expect_success 'pushing nonexistent branch by mistake should not segv' ' |
| 508 | |
| 509 | cd "$D" && |
| 510 | test_must_fail git push seven no:no |
| 511 | |
| 512 | ' |
| 513 | |
Junio C Hamano | 4942025 | 2008-09-21 23:50:01 -0700 | [diff] [blame] | 514 | test_expect_success 'auto tag following fetches minimum' ' |
| 515 | |
| 516 | cd "$D" && |
| 517 | git clone .git follow && |
| 518 | git checkout HEAD^0 && |
| 519 | ( |
| 520 | for i in 1 2 3 4 5 6 7 |
| 521 | do |
| 522 | echo $i >>file && |
| 523 | git commit -m $i -a && |
| 524 | git tag -a -m $i excess-$i || exit 1 |
| 525 | done |
| 526 | ) && |
| 527 | git checkout master && |
| 528 | ( |
| 529 | cd follow && |
| 530 | git fetch |
| 531 | ) |
| 532 | ' |
| 533 | |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 534 | test_expect_success 'refuse to fetch into the current branch' ' |
| 535 | |
| 536 | test_must_fail git fetch . side:master |
| 537 | |
| 538 | ' |
| 539 | |
| 540 | test_expect_success 'fetch into the current branch with --update-head-ok' ' |
| 541 | |
| 542 | git fetch --update-head-ok . side:master |
| 543 | |
| 544 | ' |
| 545 | |
Johannes Sixt | 3fdcdbd | 2010-02-25 21:03:44 +0100 | [diff] [blame] | 546 | test_expect_success 'fetch --dry-run' ' |
| 547 | |
| 548 | rm -f .git/FETCH_HEAD && |
| 549 | git fetch --dry-run . && |
| 550 | ! test -f .git/FETCH_HEAD |
| 551 | ' |
| 552 | |
Julian Phillips | 95c96d4 | 2009-11-13 21:25:56 +0000 | [diff] [blame] | 553 | test_expect_success "should be able to fetch with duplicate refspecs" ' |
Thomas Rast | aa98285 | 2012-03-01 22:40:49 +0100 | [diff] [blame] | 554 | mkdir dups && |
| 555 | ( |
| 556 | cd dups && |
| 557 | git init && |
| 558 | git config branch.master.remote three && |
| 559 | git config remote.three.url ../three/.git && |
| 560 | git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* && |
| 561 | git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* && |
| 562 | git fetch three |
| 563 | ) |
Julian Phillips | 95c96d4 | 2009-11-13 21:25:56 +0000 | [diff] [blame] | 564 | ' |
| 565 | |
Junio C Hamano | 60650a4 | 2018-08-01 09:22:37 -0700 | [diff] [blame] | 566 | test_expect_success 'LHS of refspec follows ref disambiguation rules' ' |
| 567 | mkdir lhs-ambiguous && |
| 568 | ( |
| 569 | cd lhs-ambiguous && |
| 570 | git init server && |
| 571 | test_commit -C server unwanted && |
| 572 | test_commit -C server wanted && |
| 573 | |
| 574 | git init client && |
| 575 | |
| 576 | # Check a name coming after "refs" alphabetically ... |
| 577 | git -C server update-ref refs/heads/s wanted && |
| 578 | git -C server update-ref refs/heads/refs/heads/s unwanted && |
| 579 | git -C client fetch ../server +refs/heads/s:refs/heads/checkthis && |
| 580 | git -C server rev-parse wanted >expect && |
| 581 | git -C client rev-parse checkthis >actual && |
| 582 | test_cmp expect actual && |
| 583 | |
| 584 | # ... and one before. |
| 585 | git -C server update-ref refs/heads/q wanted && |
| 586 | git -C server update-ref refs/heads/refs/heads/q unwanted && |
| 587 | git -C client fetch ../server +refs/heads/q:refs/heads/checkthis && |
| 588 | git -C server rev-parse wanted >expect && |
| 589 | git -C client rev-parse checkthis >actual && |
| 590 | test_cmp expect actual && |
| 591 | |
| 592 | # Tags are preferred over branches like refs/{heads,tags}/* |
| 593 | git -C server update-ref refs/tags/t wanted && |
| 594 | git -C server update-ref refs/heads/t unwanted && |
| 595 | git -C client fetch ../server +t:refs/heads/checkthis && |
| 596 | git -C server rev-parse wanted >expect && |
| 597 | git -C client rev-parse checkthis >actual |
| 598 | ) |
| 599 | ' |
| 600 | |
Derrick Stolee | 50f26bd | 2019-09-02 19:22:02 -0700 | [diff] [blame] | 601 | test_expect_success 'fetch.writeCommitGraph' ' |
| 602 | git clone three write && |
| 603 | ( |
| 604 | cd three && |
| 605 | test_commit new |
| 606 | ) && |
| 607 | ( |
| 608 | cd write && |
| 609 | git -c fetch.writeCommitGraph fetch origin && |
| 610 | test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain |
| 611 | ) |
| 612 | ' |
| 613 | |
Derrick Stolee | cb99a34 | 2019-10-24 13:40:42 +0000 | [diff] [blame] | 614 | test_expect_success 'fetch.writeCommitGraph with submodules' ' |
Derrick Stolee | e88aab9 | 2019-10-24 13:40:41 +0000 | [diff] [blame] | 615 | git clone dups super && |
| 616 | ( |
| 617 | cd super && |
| 618 | git submodule add "file://$TRASH_DIRECTORY/three" && |
| 619 | git commit -m "add submodule" |
| 620 | ) && |
| 621 | git clone "super" super-clone && |
| 622 | ( |
| 623 | cd super-clone && |
| 624 | rm -rf .git/objects/info && |
| 625 | git -c fetch.writeCommitGraph=true fetch origin && |
| 626 | test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain |
| 627 | ) |
| 628 | ' |
| 629 | |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 630 | # configured prune tests |
| 631 | |
| 632 | set_config_tristate () { |
| 633 | # var=$1 val=$2 |
| 634 | case "$2" in |
Ævar Arnfjörð Bjarmason | 59caf52 | 2018-02-09 20:32:09 +0000 | [diff] [blame] | 635 | unset) |
| 636 | test_unconfig "$1" |
| 637 | ;; |
| 638 | *) |
| 639 | git config "$1" "$2" |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 640 | key=$(echo $1 | sed -e 's/^remote\.origin/fetch/') |
| 641 | git_fetch_c="$git_fetch_c -c $key=$2" |
Ævar Arnfjörð Bjarmason | 59caf52 | 2018-02-09 20:32:09 +0000 | [diff] [blame] | 642 | ;; |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 643 | esac |
| 644 | } |
| 645 | |
| 646 | test_configured_prune () { |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 647 | test_configured_prune_type "$@" "name" |
| 648 | test_configured_prune_type "$@" "link" |
| 649 | } |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 650 | |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 651 | test_configured_prune_type () { |
Ævar Arnfjörð Bjarmason | eca142d | 2018-02-09 20:32:04 +0000 | [diff] [blame] | 652 | fetch_prune=$1 |
| 653 | remote_origin_prune=$2 |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 654 | fetch_prune_tags=$3 |
| 655 | remote_origin_prune_tags=$4 |
| 656 | expected_branch=$5 |
| 657 | expected_tag=$6 |
| 658 | cmdline=$7 |
| 659 | mode=$8 |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 660 | |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 661 | if test -z "$cmdline_setup" |
| 662 | then |
| 663 | test_expect_success 'setup cmdline_setup variable for subsequent test' ' |
| 664 | remote_url="file://$(git -C one config remote.origin.url)" && |
| 665 | remote_fetch="$(git -C one config remote.origin.fetch)" && |
| 666 | cmdline_setup="\"$remote_url\" \"$remote_fetch\"" |
| 667 | ' |
| 668 | fi |
| 669 | |
| 670 | if test "$mode" = 'link' |
| 671 | then |
| 672 | new_cmdline="" |
| 673 | |
| 674 | if test "$cmdline" = "" |
| 675 | then |
| 676 | new_cmdline=$cmdline_setup |
| 677 | else |
| 678 | new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g') |
| 679 | fi |
| 680 | |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 681 | if test "$fetch_prune_tags" = 'true' || |
| 682 | test "$remote_origin_prune_tags" = 'true' |
| 683 | then |
| 684 | if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/ |
| 685 | then |
| 686 | new_cmdline="$new_cmdline refs/tags/*:refs/tags/*" |
| 687 | fi |
| 688 | fi |
| 689 | |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 690 | cmdline="$new_cmdline" |
| 691 | fi |
| 692 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 693 | test_expect_success "$mode prune fetch.prune=$1 remote.origin.prune=$2 fetch.pruneTags=$3 remote.origin.pruneTags=$4${7:+ $7}; branch:$5 tag:$6" ' |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 694 | # make sure a newbranch is there in . and also in one |
| 695 | git branch -f newbranch && |
Ævar Arnfjörð Bjarmason | ca3065e | 2018-02-09 20:32:06 +0000 | [diff] [blame] | 696 | git tag -f newtag && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 697 | ( |
| 698 | cd one && |
| 699 | test_unconfig fetch.prune && |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 700 | test_unconfig fetch.pruneTags && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 701 | test_unconfig remote.origin.prune && |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 702 | test_unconfig remote.origin.pruneTags && |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 703 | git fetch '"$cmdline_setup"' && |
Ævar Arnfjörð Bjarmason | ca3065e | 2018-02-09 20:32:06 +0000 | [diff] [blame] | 704 | git rev-parse --verify refs/remotes/origin/newbranch && |
| 705 | git rev-parse --verify refs/tags/newtag |
Jeff King | 99094a7 | 2015-03-20 06:07:15 -0400 | [diff] [blame] | 706 | ) && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 707 | |
Ævar Arnfjörð Bjarmason | d365112 | 2018-08-13 19:22:48 +0000 | [diff] [blame] | 708 | # now remove them |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 709 | git branch -d newbranch && |
Ævar Arnfjörð Bjarmason | ca3065e | 2018-02-09 20:32:06 +0000 | [diff] [blame] | 710 | git tag -d newtag && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 711 | |
| 712 | # then test |
| 713 | ( |
| 714 | cd one && |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 715 | git_fetch_c="" && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 716 | set_config_tristate fetch.prune $fetch_prune && |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 717 | set_config_tristate fetch.pruneTags $fetch_prune_tags && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 718 | set_config_tristate remote.origin.prune $remote_origin_prune && |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 719 | set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 720 | |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 721 | if test "$mode" != "link" |
| 722 | then |
| 723 | git_fetch_c="" |
| 724 | fi && |
| 725 | git$git_fetch_c fetch '"$cmdline"' && |
Ævar Arnfjörð Bjarmason | eca142d | 2018-02-09 20:32:04 +0000 | [diff] [blame] | 726 | case "$expected_branch" in |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 727 | pruned) |
| 728 | test_must_fail git rev-parse --verify refs/remotes/origin/newbranch |
| 729 | ;; |
| 730 | kept) |
| 731 | git rev-parse --verify refs/remotes/origin/newbranch |
| 732 | ;; |
Ævar Arnfjörð Bjarmason | ca3065e | 2018-02-09 20:32:06 +0000 | [diff] [blame] | 733 | esac && |
| 734 | case "$expected_tag" in |
| 735 | pruned) |
| 736 | test_must_fail git rev-parse --verify refs/tags/newtag |
| 737 | ;; |
| 738 | kept) |
| 739 | git rev-parse --verify refs/tags/newtag |
| 740 | ;; |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 741 | esac |
| 742 | ) |
| 743 | ' |
| 744 | } |
| 745 | |
Ævar Arnfjörð Bjarmason | bf16ab7 | 2018-02-09 20:32:05 +0000 | [diff] [blame] | 746 | # $1 config: fetch.prune |
| 747 | # $2 config: remote.<name>.prune |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 748 | # $3 config: fetch.pruneTags |
| 749 | # $4 config: remote.<name>.pruneTags |
| 750 | # $5 expect: branch to be pruned? |
| 751 | # $6 expect: tag to be pruned? |
| 752 | # $7 git-fetch $cmdline: |
Ævar Arnfjörð Bjarmason | bf16ab7 | 2018-02-09 20:32:05 +0000 | [diff] [blame] | 753 | # |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 754 | # $1 $2 $3 $4 $5 $6 $7 |
| 755 | test_configured_prune unset unset unset unset kept kept "" |
| 756 | test_configured_prune unset unset unset unset kept kept "--no-prune" |
| 757 | test_configured_prune unset unset unset unset pruned kept "--prune" |
| 758 | test_configured_prune unset unset unset unset kept pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 759 | "--prune origin refs/tags/*:refs/tags/*" |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 760 | test_configured_prune unset unset unset unset pruned pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 761 | "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 762 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 763 | test_configured_prune false unset unset unset kept kept "" |
| 764 | test_configured_prune false unset unset unset kept kept "--no-prune" |
| 765 | test_configured_prune false unset unset unset pruned kept "--prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 766 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 767 | test_configured_prune true unset unset unset pruned kept "" |
| 768 | test_configured_prune true unset unset unset pruned kept "--prune" |
| 769 | test_configured_prune true unset unset unset kept kept "--no-prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 770 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 771 | test_configured_prune unset false unset unset kept kept "" |
| 772 | test_configured_prune unset false unset unset kept kept "--no-prune" |
| 773 | test_configured_prune unset false unset unset pruned kept "--prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 774 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 775 | test_configured_prune false false unset unset kept kept "" |
| 776 | test_configured_prune false false unset unset kept kept "--no-prune" |
| 777 | test_configured_prune false false unset unset pruned kept "--prune" |
| 778 | test_configured_prune false false unset unset kept pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 779 | "--prune origin refs/tags/*:refs/tags/*" |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 780 | test_configured_prune false false unset unset pruned pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 781 | "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 782 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 783 | test_configured_prune true false unset unset kept kept "" |
| 784 | test_configured_prune true false unset unset pruned kept "--prune" |
| 785 | test_configured_prune true false unset unset kept kept "--no-prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 786 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 787 | test_configured_prune unset true unset unset pruned kept "" |
| 788 | test_configured_prune unset true unset unset kept kept "--no-prune" |
| 789 | test_configured_prune unset true unset unset pruned kept "--prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 790 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 791 | test_configured_prune false true unset unset pruned kept "" |
| 792 | test_configured_prune false true unset unset kept kept "--no-prune" |
| 793 | test_configured_prune false true unset unset pruned kept "--prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 794 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 795 | test_configured_prune true true unset unset pruned kept "" |
| 796 | test_configured_prune true true unset unset pruned kept "--prune" |
| 797 | test_configured_prune true true unset unset kept kept "--no-prune" |
| 798 | test_configured_prune true true unset unset kept pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 799 | "--prune origin refs/tags/*:refs/tags/*" |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 800 | test_configured_prune true true unset unset pruned pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 801 | "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 802 | |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 803 | # --prune-tags on its own does nothing, needs --prune as well, same |
Elijah Newren | 6d12b53 | 2020-07-28 20:45:38 +0000 | [diff] [blame] | 804 | # for fetch.pruneTags without fetch.prune |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 805 | test_configured_prune unset unset unset unset kept kept "--prune-tags" |
| 806 | test_configured_prune unset unset true unset kept kept "" |
| 807 | test_configured_prune unset unset unset true kept kept "" |
| 808 | |
| 809 | # These will prune the tags |
| 810 | test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags" |
| 811 | test_configured_prune true unset true unset pruned pruned "" |
| 812 | test_configured_prune unset true unset true pruned pruned "" |
| 813 | |
| 814 | # remote.<name>.pruneTags overrides fetch.pruneTags, just like |
| 815 | # remote.<name>.prune overrides fetch.prune if set. |
| 816 | test_configured_prune true unset true unset pruned pruned "" |
| 817 | test_configured_prune false true false true pruned pruned "" |
| 818 | test_configured_prune true false true false kept kept "" |
| 819 | |
| 820 | # When --prune-tags is supplied it's ignored if an explicit refspec is |
| 821 | # given, same for the configuration options. |
| 822 | test_configured_prune unset unset unset unset pruned kept \ |
| 823 | "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*" |
| 824 | test_configured_prune unset unset true unset pruned kept \ |
| 825 | "--prune origin +refs/heads/*:refs/remotes/origin/*" |
| 826 | test_configured_prune unset unset unset true pruned kept \ |
| 827 | "--prune origin +refs/heads/*:refs/remotes/origin/*" |
| 828 | |
| 829 | # Pruning that also takes place if a file:// url replaces a named |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 830 | # remote. However, because there's no implicit |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 831 | # +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the |
| 832 | # command-line negates --prune-tags, the branches will not be pruned. |
| 833 | test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name" |
| 834 | test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link" |
| 835 | test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name" |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 836 | test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link" |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 837 | test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name" |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 838 | test_configured_prune_type unset unset unset unset kept pruned "--prune --prune-tags origin" "link" |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 839 | test_configured_prune_type unset unset true unset pruned pruned "--prune origin" "name" |
| 840 | test_configured_prune_type unset unset true unset kept pruned "--prune origin" "link" |
| 841 | test_configured_prune_type unset unset unset true pruned pruned "--prune origin" "name" |
| 842 | test_configured_prune_type unset unset unset true kept pruned "--prune origin" "link" |
| 843 | test_configured_prune_type true unset true unset pruned pruned "origin" "name" |
| 844 | test_configured_prune_type true unset true unset kept pruned "origin" "link" |
| 845 | test_configured_prune_type unset true true unset pruned pruned "origin" "name" |
| 846 | test_configured_prune_type unset true true unset kept pruned "origin" "link" |
| 847 | test_configured_prune_type unset true unset true pruned pruned "origin" "name" |
| 848 | test_configured_prune_type unset true unset true kept pruned "origin" "link" |
| 849 | |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 850 | # When all remote.origin.fetch settings are deleted a --prune |
| 851 | # --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so |
| 852 | # tags, but not tracking branches, will be deleted. |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 853 | test_expect_success 'remove remote.origin.fetch "one"' ' |
| 854 | ( |
| 855 | cd one && |
| 856 | git config --unset-all remote.origin.fetch |
| 857 | ) |
| 858 | ' |
| 859 | test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name" |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 860 | test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link" |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 861 | |
| 862 | test_expect_success 'all boundary commits are excluded' ' |
| 863 | test_commit base && |
| 864 | test_commit oneside && |
| 865 | git checkout HEAD^ && |
| 866 | test_commit otherside && |
| 867 | git checkout master && |
| 868 | test_tick && |
| 869 | git merge otherside && |
| 870 | ad=$(git log --no-walk --format=%ad HEAD) && |
| 871 | git bundle create twoside-boundary.bdl master --since="$ad" && |
| 872 | convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack && |
| 873 | pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) && |
| 874 | test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3 |
| 875 | ' |
| 876 | |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 877 | test_expect_success 'fetch --prune prints the remotes url' ' |
| 878 | git branch goodbye && |
| 879 | git clone . only-prunes && |
| 880 | git branch -D goodbye && |
| 881 | ( |
| 882 | cd only-prunes && |
| 883 | git fetch --prune origin 2>&1 | head -n1 >../actual |
| 884 | ) && |
| 885 | echo "From ${D}/." >expect && |
Vasco Almeida | 1edbaac | 2016-06-17 20:21:07 +0000 | [diff] [blame] | 886 | test_i18ncmp expect actual |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 887 | ' |
| 888 | |
Tom Miller | 10a6cc8 | 2014-01-02 20:28:52 -0600 | [diff] [blame] | 889 | test_expect_success 'branchname D/F conflict resolved by --prune' ' |
| 890 | git branch dir/file && |
| 891 | git clone . prune-df-conflict && |
| 892 | git branch -D dir/file && |
| 893 | git branch dir && |
| 894 | ( |
| 895 | cd prune-df-conflict && |
| 896 | git fetch --prune && |
| 897 | git rev-parse origin/dir >../actual |
| 898 | ) && |
| 899 | git rev-parse dir >expect && |
| 900 | test_cmp expect actual |
| 901 | ' |
| 902 | |
Jeff King | 4c22408 | 2014-01-15 05:46:13 -0500 | [diff] [blame] | 903 | test_expect_success 'fetching a one-level ref works' ' |
| 904 | test_commit extra && |
| 905 | git reset --hard HEAD^ && |
| 906 | git update-ref refs/foo extra && |
| 907 | git init one-level && |
| 908 | ( |
| 909 | cd one-level && |
| 910 | git fetch .. HEAD refs/foo |
| 911 | ) |
| 912 | ' |
| 913 | |
Johannes Schindelin | 0898c96 | 2016-01-13 18:20:11 +0100 | [diff] [blame] | 914 | test_expect_success 'fetching with auto-gc does not lock up' ' |
| 915 | write_script askyesno <<-\EOF && |
| 916 | echo "$*" && |
| 917 | false |
| 918 | EOF |
| 919 | git clone "file://$D" auto-gc && |
| 920 | test_commit test2 && |
Michael J Gruber | 816c193 | 2016-03-04 11:53:50 +0100 | [diff] [blame] | 921 | ( |
| 922 | cd auto-gc && |
Kim Gybels | 12e73a3 | 2018-07-09 22:37:27 +0200 | [diff] [blame] | 923 | git config fetch.unpackLimit 1 && |
Michael J Gruber | 816c193 | 2016-03-04 11:53:50 +0100 | [diff] [blame] | 924 | git config gc.autoPackLimit 1 && |
SZEDER Gábor | bb05510 | 2016-05-01 17:37:43 +0200 | [diff] [blame] | 925 | git config gc.autoDetach false && |
Michael J Gruber | 816c193 | 2016-03-04 11:53:50 +0100 | [diff] [blame] | 926 | GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 && |
Kim Gybels | 12e73a3 | 2018-07-09 22:37:27 +0200 | [diff] [blame] | 927 | test_i18ngrep "Auto packing the repository" fetch.out && |
Michael J Gruber | 816c193 | 2016-03-04 11:53:50 +0100 | [diff] [blame] | 928 | ! grep "Should I try again" fetch.out |
| 929 | ) |
Johannes Schindelin | 0898c96 | 2016-01-13 18:20:11 +0100 | [diff] [blame] | 930 | ' |
| 931 | |
Vasco Almeida | 377d7de | 2016-07-26 12:58:54 +0000 | [diff] [blame] | 932 | test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' ' |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 933 | git clone . full-output && |
| 934 | test_commit looooooooooooong-tag && |
| 935 | ( |
| 936 | cd full-output && |
Pratik Karki | a4d4e32 | 2018-03-27 23:16:37 +0545 | [diff] [blame] | 937 | git -c fetch.output=full fetch origin >actual 2>&1 && |
| 938 | grep -e "->" actual | cut -c 22- >../actual |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 939 | ) && |
| 940 | cat >expect <<-\EOF && |
| 941 | master -> origin/master |
| 942 | looooooooooooong-tag -> looooooooooooong-tag |
| 943 | EOF |
| 944 | test_cmp expect actual |
| 945 | ' |
| 946 | |
Vasco Almeida | 377d7de | 2016-07-26 12:58:54 +0000 | [diff] [blame] | 947 | test_expect_success C_LOCALE_OUTPUT 'fetch compact output' ' |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 948 | git clone . compact && |
| 949 | test_commit extraaa && |
| 950 | ( |
| 951 | cd compact && |
Pratik Karki | a4d4e32 | 2018-03-27 23:16:37 +0545 | [diff] [blame] | 952 | git -c fetch.output=compact fetch origin >actual 2>&1 && |
| 953 | grep -e "->" actual | cut -c 22- >../actual |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 954 | ) && |
| 955 | cat >expect <<-\EOF && |
| 956 | master -> origin/* |
| 957 | extraaa -> * |
| 958 | EOF |
| 959 | test_cmp expect actual |
| 960 | ' |
| 961 | |
SZEDER Gábor | 12b1826 | 2019-08-01 17:53:07 +0200 | [diff] [blame] | 962 | test_expect_success '--no-show-forced-updates' ' |
| 963 | mkdir forced-updates && |
| 964 | ( |
| 965 | cd forced-updates && |
| 966 | git init && |
| 967 | test_commit 1 && |
| 968 | test_commit 2 |
| 969 | ) && |
| 970 | git clone forced-updates forced-update-clone && |
| 971 | git clone forced-updates no-forced-update-clone && |
| 972 | git -C forced-updates reset --hard HEAD~1 && |
| 973 | ( |
| 974 | cd forced-update-clone && |
| 975 | git fetch --show-forced-updates origin 2>output && |
| 976 | test_i18ngrep "(forced update)" output |
| 977 | ) && |
| 978 | ( |
| 979 | cd no-forced-update-clone && |
| 980 | git fetch --no-show-forced-updates origin 2>output && |
| 981 | test_i18ngrep ! "(forced update)" output |
| 982 | ) |
| 983 | ' |
| 984 | |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 985 | setup_negotiation_tip () { |
| 986 | SERVER="$1" |
| 987 | URL="$2" |
| 988 | USE_PROTOCOL_V2="$3" |
| 989 | |
| 990 | rm -rf "$SERVER" client trace && |
| 991 | git init "$SERVER" && |
| 992 | test_commit -C "$SERVER" alpha_1 && |
| 993 | test_commit -C "$SERVER" alpha_2 && |
| 994 | git -C "$SERVER" checkout --orphan beta && |
| 995 | test_commit -C "$SERVER" beta_1 && |
| 996 | test_commit -C "$SERVER" beta_2 && |
| 997 | |
| 998 | git clone "$URL" client && |
| 999 | |
| 1000 | if test "$USE_PROTOCOL_V2" -eq 1 |
| 1001 | then |
| 1002 | git -C "$SERVER" config protocol.version 2 && |
| 1003 | git -C client config protocol.version 2 |
| 1004 | fi && |
| 1005 | |
| 1006 | test_commit -C "$SERVER" beta_s && |
| 1007 | git -C "$SERVER" checkout master && |
| 1008 | test_commit -C "$SERVER" alpha_s && |
| 1009 | git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2 |
| 1010 | } |
| 1011 | |
| 1012 | check_negotiation_tip () { |
| 1013 | # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2 |
| 1014 | ALPHA_1=$(git -C client rev-parse alpha_1) && |
| 1015 | grep "fetch> have $ALPHA_1" trace && |
| 1016 | BETA_1=$(git -C client rev-parse beta_1) && |
| 1017 | grep "fetch> have $BETA_1" trace && |
| 1018 | ALPHA_2=$(git -C client rev-parse alpha_2) && |
| 1019 | ! grep "fetch> have $ALPHA_2" trace && |
| 1020 | BETA_2=$(git -C client rev-parse beta_2) && |
| 1021 | ! grep "fetch> have $BETA_2" trace |
| 1022 | } |
| 1023 | |
| 1024 | test_expect_success '--negotiation-tip limits "have" lines sent' ' |
| 1025 | setup_negotiation_tip server server 0 && |
| 1026 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \ |
| 1027 | --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \ |
| 1028 | origin alpha_s beta_s && |
| 1029 | check_negotiation_tip |
| 1030 | ' |
| 1031 | |
| 1032 | test_expect_success '--negotiation-tip understands globs' ' |
| 1033 | setup_negotiation_tip server server 0 && |
| 1034 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \ |
| 1035 | --negotiation-tip=*_1 \ |
| 1036 | origin alpha_s beta_s && |
| 1037 | check_negotiation_tip |
| 1038 | ' |
| 1039 | |
| 1040 | test_expect_success '--negotiation-tip understands abbreviated SHA-1' ' |
| 1041 | setup_negotiation_tip server server 0 && |
| 1042 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \ |
| 1043 | --negotiation-tip=$(git -C client rev-parse --short alpha_1) \ |
| 1044 | --negotiation-tip=$(git -C client rev-parse --short beta_1) \ |
| 1045 | origin alpha_s beta_s && |
| 1046 | check_negotiation_tip |
| 1047 | ' |
| 1048 | |
| 1049 | . "$TEST_DIRECTORY"/lib-httpd.sh |
| 1050 | start_httpd |
| 1051 | |
| 1052 | test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protocol v2' ' |
| 1053 | setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \ |
| 1054 | "$HTTPD_URL/smart/server" 1 && |
| 1055 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \ |
| 1056 | --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \ |
| 1057 | origin alpha_s beta_s && |
| 1058 | check_negotiation_tip |
| 1059 | ' |
| 1060 | |
SZEDER Gábor | 12b1826 | 2019-08-01 17:53:07 +0200 | [diff] [blame] | 1061 | # DO NOT add non-httpd-specific tests here, because the last part of this |
| 1062 | # test script is only executed when httpd is available and enabled. |
Derrick Stolee | cdbd70c | 2019-06-18 13:25:26 -0700 | [diff] [blame] | 1063 | |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 1064 | test_done |