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