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 && |
| 14 | test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l) |
| 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 | |
Väinö Järvelä | f539d0d | 2007-10-09 11:51:07 +0300 | [diff] [blame] | 177 | test_expect_success 'fetch tags when there is no tags' ' |
| 178 | |
| 179 | cd "$D" && |
| 180 | |
| 181 | mkdir notags && |
| 182 | cd notags && |
| 183 | git init && |
| 184 | |
| 185 | git fetch -t .. |
| 186 | |
| 187 | ' |
| 188 | |
Junio C Hamano | 6c96c0f | 2006-11-18 21:39:17 -0800 | [diff] [blame] | 189 | test_expect_success 'fetch following tags' ' |
| 190 | |
| 191 | cd "$D" && |
| 192 | git tag -a -m 'annotated' anno HEAD && |
| 193 | git tag light HEAD && |
| 194 | |
| 195 | mkdir four && |
| 196 | cd four && |
Nicolas Pitre | 5c94f87 | 2007-01-12 16:01:46 -0500 | [diff] [blame] | 197 | git init && |
Junio C Hamano | 6c96c0f | 2006-11-18 21:39:17 -0800 | [diff] [blame] | 198 | |
| 199 | git fetch .. :track && |
| 200 | git show-ref --verify refs/tags/anno && |
| 201 | git show-ref --verify refs/tags/light |
| 202 | |
| 203 | ' |
| 204 | |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 205 | test_expect_success 'fetch uses remote ref names to describe new refs' ' |
| 206 | cd "$D" && |
| 207 | git init descriptive && |
| 208 | ( |
| 209 | cd descriptive && |
| 210 | git config remote.o.url .. && |
| 211 | git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" && |
| 212 | git config --add remote.o.fetch "refs/others/*:refs/heads/*" && |
| 213 | git fetch o |
| 214 | ) && |
| 215 | git tag -a -m "Descriptive tag" descriptive-tag && |
| 216 | git branch descriptive-branch && |
| 217 | git checkout descriptive-branch && |
| 218 | echo "Nuts" >crazy && |
| 219 | git add crazy && |
| 220 | git commit -a -m "descriptive commit" && |
| 221 | git update-ref refs/others/crazy HEAD && |
| 222 | ( |
| 223 | cd descriptive && |
| 224 | git fetch o 2>actual && |
SZEDER Gábor | 927c1a6 | 2018-02-08 16:56:52 +0100 | [diff] [blame] | 225 | test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual && |
| 226 | test_i18ngrep "new tag.* -> descriptive-tag$" actual && |
| 227 | test_i18ngrep "new ref.* -> crazy$" actual |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 228 | ) && |
| 229 | git checkout master |
| 230 | ' |
| 231 | |
Junio C Hamano | 41ac414 | 2008-02-01 01:50:53 -0800 | [diff] [blame] | 232 | test_expect_success 'fetch must not resolve short tag name' ' |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 233 | |
| 234 | cd "$D" && |
| 235 | |
| 236 | mkdir five && |
| 237 | cd five && |
| 238 | git init && |
| 239 | |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 240 | test_must_fail git fetch .. anno:five |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 241 | |
| 242 | ' |
| 243 | |
Junio C Hamano | dd621df | 2011-11-04 14:14:05 -0700 | [diff] [blame] | 244 | test_expect_success 'fetch can now resolve short remote name' ' |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 245 | |
| 246 | cd "$D" && |
Jonathan Nieder | a48fcd8 | 2010-10-30 20:46:54 -0500 | [diff] [blame] | 247 | git update-ref refs/remotes/six/HEAD HEAD && |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 248 | |
| 249 | mkdir six && |
| 250 | cd six && |
| 251 | git init && |
| 252 | |
Junio C Hamano | dd621df | 2011-11-04 14:14:05 -0700 | [diff] [blame] | 253 | git fetch .. six:six |
Steffen Prohaska | 605b497 | 2007-11-11 15:01:48 +0100 | [diff] [blame] | 254 | ' |
| 255 | |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 256 | test_expect_success 'create bundle 1' ' |
| 257 | cd "$D" && |
| 258 | echo >file updated again by origin && |
| 259 | git commit -a -m "tip" && |
| 260 | git bundle create bundle1 master^..master |
| 261 | ' |
| 262 | |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 263 | test_expect_success 'header of bundle looks right' ' |
| 264 | head -n 1 "$D"/bundle1 | grep "^#" && |
| 265 | head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " && |
| 266 | head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " && |
| 267 | head -n 4 "$D"/bundle1 | grep "^$" |
| 268 | ' |
| 269 | |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 270 | test_expect_success 'create bundle 2' ' |
| 271 | cd "$D" && |
| 272 | git bundle create bundle2 master~2..master |
| 273 | ' |
| 274 | |
Junio C Hamano | 41ac414 | 2008-02-01 01:50:53 -0800 | [diff] [blame] | 275 | test_expect_success 'unbundle 1' ' |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 276 | cd "$D/bundle" && |
| 277 | git checkout -b some-branch && |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 278 | test_must_fail git fetch "$D/bundle1" master:master |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 279 | ' |
| 280 | |
Junio C Hamano | 2e674a9 | 2009-08-07 20:12:13 -0700 | [diff] [blame] | 281 | |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 282 | test_expect_success 'bundle 1 has only 3 files ' ' |
| 283 | cd "$D" && |
Thomas Rast | 61821aa | 2012-03-01 22:40:48 +0100 | [diff] [blame] | 284 | convert_bundle_to_pack <bundle1 >bundle.pack && |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 285 | git index-pack bundle.pack && |
Junio C Hamano | 2e674a9 | 2009-08-07 20:12:13 -0700 | [diff] [blame] | 286 | test_bundle_object_count bundle.pack 3 |
Johannes Schindelin | 8315588 | 2007-03-06 22:57:07 +0100 | [diff] [blame] | 287 | ' |
| 288 | |
Johannes Schindelin | 2e0afaf | 2007-02-22 01:59:14 +0100 | [diff] [blame] | 289 | test_expect_success 'unbundle 2' ' |
| 290 | cd "$D/bundle" && |
| 291 | git fetch ../bundle2 master:master && |
| 292 | test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)" |
| 293 | ' |
| 294 | |
Johannes Schindelin | 18449ab | 2007-03-08 00:43:05 +0100 | [diff] [blame] | 295 | test_expect_success 'bundle does not prerequisite objects' ' |
| 296 | cd "$D" && |
| 297 | touch file2 && |
| 298 | git add file2 && |
| 299 | git commit -m add.file2 file2 && |
| 300 | git bundle create bundle3 -1 HEAD && |
Thomas Rast | 61821aa | 2012-03-01 22:40:48 +0100 | [diff] [blame] | 301 | convert_bundle_to_pack <bundle3 >bundle.pack && |
Johannes Schindelin | 18449ab | 2007-03-08 00:43:05 +0100 | [diff] [blame] | 302 | git index-pack bundle.pack && |
Junio C Hamano | 2e674a9 | 2009-08-07 20:12:13 -0700 | [diff] [blame] | 303 | test_bundle_object_count bundle.pack 3 |
Johannes Schindelin | 18449ab | 2007-03-08 00:43:05 +0100 | [diff] [blame] | 304 | ' |
| 305 | |
Junio C Hamano | 7fa8254 | 2007-08-08 17:01:49 -0700 | [diff] [blame] | 306 | test_expect_success 'bundle should be able to create a full history' ' |
| 307 | |
| 308 | cd "$D" && |
| 309 | git tag -a -m '1.0' v1.0 master && |
| 310 | git bundle create bundle4 v1.0 |
| 311 | |
| 312 | ' |
| 313 | |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 314 | test_expect_success 'fetch with a non-applying branch.<name>.merge' ' |
| 315 | git config branch.master.remote yeti && |
| 316 | git config branch.master.merge refs/heads/bigfoot && |
| 317 | git config remote.blub.url one && |
| 318 | git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" && |
| 319 | git fetch blub |
| 320 | ' |
| 321 | |
Brandon Casey | 042cca3 | 2010-09-09 13:56:37 -0500 | [diff] [blame] | 322 | # URL supplied to fetch does not match the url of the configured branch's remote |
| 323 | test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' ' |
| 324 | one_head=$(cd one && git rev-parse HEAD) && |
| 325 | this_head=$(git rev-parse HEAD) && |
Brandon Casey | 6106ce4 | 2010-08-25 12:52:55 -0500 | [diff] [blame] | 326 | git update-ref -d FETCH_HEAD && |
| 327 | git fetch one && |
Brandon Casey | 042cca3 | 2010-09-09 13:56:37 -0500 | [diff] [blame] | 328 | test $one_head = "$(git rev-parse --verify FETCH_HEAD)" && |
| 329 | test $this_head = "$(git rev-parse --verify HEAD)" |
| 330 | ' |
| 331 | |
| 332 | # URL supplied to fetch matches the url of the configured branch's remote and |
| 333 | # the merge spec matches the branch the remote HEAD points to |
| 334 | test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' ' |
| 335 | one_ref=$(cd one && git symbolic-ref HEAD) && |
| 336 | git config branch.master.remote blub && |
| 337 | git config branch.master.merge "$one_ref" && |
| 338 | git update-ref -d FETCH_HEAD && |
| 339 | git fetch one && |
| 340 | test $one_head = "$(git rev-parse --verify FETCH_HEAD)" && |
| 341 | test $this_head = "$(git rev-parse --verify HEAD)" |
| 342 | ' |
| 343 | |
| 344 | # URL supplied to fetch matches the url of the configured branch's remote, but |
| 345 | # the merge spec does not match the branch the remote HEAD points to |
| 346 | test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' ' |
| 347 | git config branch.master.merge "${one_ref}_not" && |
| 348 | git update-ref -d FETCH_HEAD && |
| 349 | git fetch one && |
| 350 | test $one_head = "$(git rev-parse --verify FETCH_HEAD)" && |
| 351 | test $this_head = "$(git rev-parse --verify HEAD)" |
Brandon Casey | 6106ce4 | 2010-08-25 12:52:55 -0500 | [diff] [blame] | 352 | ' |
| 353 | |
Johannes Sixt | c2015b3 | 2007-11-04 21:26:22 +0100 | [diff] [blame] | 354 | # the strange name is: a\!'b |
| 355 | test_expect_success 'quoting of a strangely named repo' ' |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 356 | test_must_fail git fetch "a\\!'\''b" > result 2>&1 && |
Johannes Sixt | c2015b3 | 2007-11-04 21:26:22 +0100 | [diff] [blame] | 357 | cat result && |
| 358 | grep "fatal: '\''a\\\\!'\''b'\''" result |
| 359 | ' |
| 360 | |
Johannes Schindelin | c5546e8 | 2007-11-22 12:24:59 +0000 | [diff] [blame] | 361 | test_expect_success 'bundle should record HEAD correctly' ' |
| 362 | |
| 363 | cd "$D" && |
| 364 | git bundle create bundle5 HEAD master && |
| 365 | git bundle list-heads bundle5 >actual && |
| 366 | for h in HEAD refs/heads/master |
| 367 | do |
| 368 | echo "$(git rev-parse --verify $h) $h" |
| 369 | done >expect && |
Jeff King | 82ebb0b | 2008-03-12 17:36:36 -0400 | [diff] [blame] | 370 | test_cmp expect actual |
Johannes Schindelin | c5546e8 | 2007-11-22 12:24:59 +0000 | [diff] [blame] | 371 | |
| 372 | ' |
| 373 | |
Jeff King | 51f8c81 | 2013-05-11 18:14:03 +0200 | [diff] [blame] | 374 | test_expect_success 'mark initial state of origin/master' ' |
| 375 | ( |
| 376 | cd three && |
| 377 | git tag base-origin-master refs/remotes/origin/master |
| 378 | ) |
| 379 | ' |
| 380 | |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 381 | test_expect_success 'explicit fetch should update tracking' ' |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 382 | |
| 383 | cd "$D" && |
| 384 | git branch -f side && |
| 385 | ( |
| 386 | cd three && |
Jeff King | 51f8c81 | 2013-05-11 18:14:03 +0200 | [diff] [blame] | 387 | git update-ref refs/remotes/origin/master base-origin-master && |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 388 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 389 | git fetch origin master && |
| 390 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 391 | test "$o" != "$n" && |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 392 | test_must_fail git rev-parse --verify refs/remotes/origin/side |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 393 | ) |
| 394 | ' |
| 395 | |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 396 | test_expect_success 'explicit pull should update tracking' ' |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 397 | |
| 398 | cd "$D" && |
| 399 | git branch -f side && |
| 400 | ( |
| 401 | cd three && |
Jeff King | 51f8c81 | 2013-05-11 18:14:03 +0200 | [diff] [blame] | 402 | git update-ref refs/remotes/origin/master base-origin-master && |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 403 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 404 | git pull origin master && |
| 405 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
Jeff King | f269048 | 2013-05-11 18:16:52 +0200 | [diff] [blame] | 406 | test "$o" != "$n" && |
Stephan Beyer | d492b31 | 2008-07-12 17:47:52 +0200 | [diff] [blame] | 407 | test_must_fail git rev-parse --verify refs/remotes/origin/side |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 408 | ) |
| 409 | ' |
| 410 | |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 411 | test_expect_success 'explicit --refmap is allowed only with command-line refspec' ' |
| 412 | cd "$D" && |
| 413 | ( |
| 414 | cd three && |
| 415 | test_must_fail git fetch --refmap="*:refs/remotes/none/*" |
| 416 | ) |
| 417 | ' |
| 418 | |
| 419 | test_expect_success 'explicit --refmap option overrides remote.*.fetch' ' |
| 420 | cd "$D" && |
| 421 | git branch -f side && |
| 422 | ( |
| 423 | cd three && |
| 424 | git update-ref refs/remotes/origin/master base-origin-master && |
| 425 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 426 | git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master && |
| 427 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
| 428 | test "$o" = "$n" && |
| 429 | test_must_fail git rev-parse --verify refs/remotes/origin/side && |
| 430 | git rev-parse --verify refs/remotes/other/master |
| 431 | ) |
| 432 | ' |
| 433 | |
| 434 | test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' ' |
| 435 | cd "$D" && |
| 436 | git branch -f side && |
| 437 | ( |
| 438 | cd three && |
| 439 | git update-ref refs/remotes/origin/master base-origin-master && |
| 440 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 441 | git fetch --refmap="" origin master && |
| 442 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
| 443 | test "$o" = "$n" && |
| 444 | test_must_fail git rev-parse --verify refs/remotes/origin/side |
| 445 | ) |
| 446 | ' |
| 447 | |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 448 | test_expect_success 'configured fetch updates tracking' ' |
| 449 | |
| 450 | cd "$D" && |
| 451 | git branch -f side && |
| 452 | ( |
| 453 | cd three && |
Jeff King | 51f8c81 | 2013-05-11 18:14:03 +0200 | [diff] [blame] | 454 | git update-ref refs/remotes/origin/master base-origin-master && |
Junio C Hamano | c701596 | 2007-12-04 21:58:42 -0800 | [diff] [blame] | 455 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 456 | git fetch origin && |
| 457 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
| 458 | test "$o" != "$n" && |
| 459 | git rev-parse --verify refs/remotes/origin/side |
| 460 | ) |
| 461 | ' |
| 462 | |
John Keeping | 823c6d5 | 2013-05-27 17:33:09 +0100 | [diff] [blame] | 463 | test_expect_success 'non-matching refspecs do not confuse tracking update' ' |
| 464 | cd "$D" && |
| 465 | git update-ref refs/odd/location HEAD && |
| 466 | ( |
| 467 | cd three && |
| 468 | git update-ref refs/remotes/origin/master base-origin-master && |
| 469 | git config --add remote.origin.fetch \ |
| 470 | refs/odd/location:refs/remotes/origin/odd && |
| 471 | o=$(git rev-parse --verify refs/remotes/origin/master) && |
| 472 | git fetch origin master && |
| 473 | n=$(git rev-parse --verify refs/remotes/origin/master) && |
| 474 | test "$o" != "$n" && |
| 475 | test_must_fail git rev-parse --verify refs/remotes/origin/odd |
| 476 | ) |
| 477 | ' |
| 478 | |
Jeff King | 9a7bbd1 | 2008-06-16 12:15:02 -0400 | [diff] [blame] | 479 | test_expect_success 'pushing nonexistent branch by mistake should not segv' ' |
| 480 | |
| 481 | cd "$D" && |
| 482 | test_must_fail git push seven no:no |
| 483 | |
| 484 | ' |
| 485 | |
Junio C Hamano | 4942025 | 2008-09-21 23:50:01 -0700 | [diff] [blame] | 486 | test_expect_success 'auto tag following fetches minimum' ' |
| 487 | |
| 488 | cd "$D" && |
| 489 | git clone .git follow && |
| 490 | git checkout HEAD^0 && |
| 491 | ( |
| 492 | for i in 1 2 3 4 5 6 7 |
| 493 | do |
| 494 | echo $i >>file && |
| 495 | git commit -m $i -a && |
| 496 | git tag -a -m $i excess-$i || exit 1 |
| 497 | done |
| 498 | ) && |
| 499 | git checkout master && |
| 500 | ( |
| 501 | cd follow && |
| 502 | git fetch |
| 503 | ) |
| 504 | ' |
| 505 | |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 506 | test_expect_success 'refuse to fetch into the current branch' ' |
| 507 | |
| 508 | test_must_fail git fetch . side:master |
| 509 | |
| 510 | ' |
| 511 | |
| 512 | test_expect_success 'fetch into the current branch with --update-head-ok' ' |
| 513 | |
| 514 | git fetch --update-head-ok . side:master |
| 515 | |
| 516 | ' |
| 517 | |
Johannes Sixt | 3fdcdbd | 2010-02-25 21:03:44 +0100 | [diff] [blame] | 518 | test_expect_success 'fetch --dry-run' ' |
| 519 | |
| 520 | rm -f .git/FETCH_HEAD && |
| 521 | git fetch --dry-run . && |
| 522 | ! test -f .git/FETCH_HEAD |
| 523 | ' |
| 524 | |
Julian Phillips | 95c96d4 | 2009-11-13 21:25:56 +0000 | [diff] [blame] | 525 | test_expect_success "should be able to fetch with duplicate refspecs" ' |
Thomas Rast | aa98285 | 2012-03-01 22:40:49 +0100 | [diff] [blame] | 526 | mkdir dups && |
| 527 | ( |
| 528 | cd dups && |
| 529 | git init && |
| 530 | git config branch.master.remote three && |
| 531 | git config remote.three.url ../three/.git && |
| 532 | git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* && |
| 533 | git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* && |
| 534 | git fetch three |
| 535 | ) |
Julian Phillips | 95c96d4 | 2009-11-13 21:25:56 +0000 | [diff] [blame] | 536 | ' |
| 537 | |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 538 | # configured prune tests |
| 539 | |
| 540 | set_config_tristate () { |
| 541 | # var=$1 val=$2 |
| 542 | case "$2" in |
Ævar Arnfjörð Bjarmason | 59caf52 | 2018-02-09 20:32:09 +0000 | [diff] [blame] | 543 | unset) |
| 544 | test_unconfig "$1" |
| 545 | ;; |
| 546 | *) |
| 547 | git config "$1" "$2" |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 548 | key=$(echo $1 | sed -e 's/^remote\.origin/fetch/') |
| 549 | git_fetch_c="$git_fetch_c -c $key=$2" |
Ævar Arnfjörð Bjarmason | 59caf52 | 2018-02-09 20:32:09 +0000 | [diff] [blame] | 550 | ;; |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 551 | esac |
| 552 | } |
| 553 | |
| 554 | test_configured_prune () { |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 555 | test_configured_prune_type "$@" "name" |
| 556 | test_configured_prune_type "$@" "link" |
| 557 | } |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 558 | |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 559 | test_configured_prune_type () { |
Ævar Arnfjörð Bjarmason | eca142d | 2018-02-09 20:32:04 +0000 | [diff] [blame] | 560 | fetch_prune=$1 |
| 561 | remote_origin_prune=$2 |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 562 | fetch_prune_tags=$3 |
| 563 | remote_origin_prune_tags=$4 |
| 564 | expected_branch=$5 |
| 565 | expected_tag=$6 |
| 566 | cmdline=$7 |
| 567 | mode=$8 |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 568 | |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 569 | if test -z "$cmdline_setup" |
| 570 | then |
| 571 | test_expect_success 'setup cmdline_setup variable for subsequent test' ' |
| 572 | remote_url="file://$(git -C one config remote.origin.url)" && |
| 573 | remote_fetch="$(git -C one config remote.origin.fetch)" && |
| 574 | cmdline_setup="\"$remote_url\" \"$remote_fetch\"" |
| 575 | ' |
| 576 | fi |
| 577 | |
| 578 | if test "$mode" = 'link' |
| 579 | then |
| 580 | new_cmdline="" |
| 581 | |
| 582 | if test "$cmdline" = "" |
| 583 | then |
| 584 | new_cmdline=$cmdline_setup |
| 585 | else |
| 586 | new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g') |
| 587 | fi |
| 588 | |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 589 | if test "$fetch_prune_tags" = 'true' || |
| 590 | test "$remote_origin_prune_tags" = 'true' |
| 591 | then |
| 592 | if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/ |
| 593 | then |
| 594 | new_cmdline="$new_cmdline refs/tags/*:refs/tags/*" |
| 595 | fi |
| 596 | fi |
| 597 | |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 598 | cmdline="$new_cmdline" |
| 599 | fi |
| 600 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 601 | 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] | 602 | # make sure a newbranch is there in . and also in one |
| 603 | git branch -f newbranch && |
Ævar Arnfjörð Bjarmason | ca3065e | 2018-02-09 20:32:06 +0000 | [diff] [blame] | 604 | git tag -f newtag && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 605 | ( |
| 606 | cd one && |
| 607 | test_unconfig fetch.prune && |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 608 | test_unconfig fetch.pruneTags && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 609 | test_unconfig remote.origin.prune && |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 610 | test_unconfig remote.origin.pruneTags && |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 611 | git fetch '"$cmdline_setup"' && |
Ævar Arnfjörð Bjarmason | ca3065e | 2018-02-09 20:32:06 +0000 | [diff] [blame] | 612 | git rev-parse --verify refs/remotes/origin/newbranch && |
| 613 | git rev-parse --verify refs/tags/newtag |
Jeff King | 99094a7 | 2015-03-20 06:07:15 -0400 | [diff] [blame] | 614 | ) && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 615 | |
| 616 | # now remove it |
| 617 | git branch -d newbranch && |
Ævar Arnfjörð Bjarmason | ca3065e | 2018-02-09 20:32:06 +0000 | [diff] [blame] | 618 | git tag -d newtag && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 619 | |
| 620 | # then test |
| 621 | ( |
| 622 | cd one && |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 623 | git_fetch_c="" && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 624 | set_config_tristate fetch.prune $fetch_prune && |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 625 | set_config_tristate fetch.pruneTags $fetch_prune_tags && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 626 | set_config_tristate remote.origin.prune $remote_origin_prune && |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 627 | set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags && |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 628 | |
Ævar Arnfjörð Bjarmason | e1790f9 | 2018-02-09 20:32:10 +0000 | [diff] [blame] | 629 | if test "$mode" != "link" |
| 630 | then |
| 631 | git_fetch_c="" |
| 632 | fi && |
| 633 | git$git_fetch_c fetch '"$cmdline"' && |
Ævar Arnfjörð Bjarmason | eca142d | 2018-02-09 20:32:04 +0000 | [diff] [blame] | 634 | case "$expected_branch" in |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 635 | pruned) |
| 636 | test_must_fail git rev-parse --verify refs/remotes/origin/newbranch |
| 637 | ;; |
| 638 | kept) |
| 639 | git rev-parse --verify refs/remotes/origin/newbranch |
| 640 | ;; |
Ævar Arnfjörð Bjarmason | ca3065e | 2018-02-09 20:32:06 +0000 | [diff] [blame] | 641 | esac && |
| 642 | case "$expected_tag" in |
| 643 | pruned) |
| 644 | test_must_fail git rev-parse --verify refs/tags/newtag |
| 645 | ;; |
| 646 | kept) |
| 647 | git rev-parse --verify refs/tags/newtag |
| 648 | ;; |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 649 | esac |
| 650 | ) |
| 651 | ' |
| 652 | } |
| 653 | |
Ævar Arnfjörð Bjarmason | bf16ab7 | 2018-02-09 20:32:05 +0000 | [diff] [blame] | 654 | # $1 config: fetch.prune |
| 655 | # $2 config: remote.<name>.prune |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 656 | # $3 config: fetch.pruneTags |
| 657 | # $4 config: remote.<name>.pruneTags |
| 658 | # $5 expect: branch to be pruned? |
| 659 | # $6 expect: tag to be pruned? |
| 660 | # $7 git-fetch $cmdline: |
Ævar Arnfjörð Bjarmason | bf16ab7 | 2018-02-09 20:32:05 +0000 | [diff] [blame] | 661 | # |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 662 | # $1 $2 $3 $4 $5 $6 $7 |
| 663 | test_configured_prune unset unset unset unset kept kept "" |
| 664 | test_configured_prune unset unset unset unset kept kept "--no-prune" |
| 665 | test_configured_prune unset unset unset unset pruned kept "--prune" |
| 666 | test_configured_prune unset unset unset unset kept pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 667 | "--prune origin refs/tags/*:refs/tags/*" |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 668 | test_configured_prune unset unset unset unset pruned pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 669 | "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 670 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 671 | test_configured_prune false unset unset unset kept kept "" |
| 672 | test_configured_prune false unset unset unset kept kept "--no-prune" |
| 673 | test_configured_prune false unset unset unset pruned kept "--prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 674 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 675 | test_configured_prune true unset unset unset pruned kept "" |
| 676 | test_configured_prune true unset unset unset pruned kept "--prune" |
| 677 | test_configured_prune true unset unset unset kept kept "--no-prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 678 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 679 | test_configured_prune unset false unset unset kept kept "" |
| 680 | test_configured_prune unset false unset unset kept kept "--no-prune" |
| 681 | test_configured_prune unset false unset unset pruned kept "--prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 682 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 683 | test_configured_prune false false unset unset kept kept "" |
| 684 | test_configured_prune false false unset unset kept kept "--no-prune" |
| 685 | test_configured_prune false false unset unset pruned kept "--prune" |
| 686 | test_configured_prune false false unset unset kept pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 687 | "--prune origin refs/tags/*:refs/tags/*" |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 688 | test_configured_prune false false unset unset pruned pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 689 | "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 690 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 691 | test_configured_prune true false unset unset kept kept "" |
| 692 | test_configured_prune true false unset unset pruned kept "--prune" |
| 693 | test_configured_prune true false unset unset kept kept "--no-prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 694 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 695 | test_configured_prune unset true unset unset pruned kept "" |
| 696 | test_configured_prune unset true unset unset kept kept "--no-prune" |
| 697 | test_configured_prune unset true unset unset pruned kept "--prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 698 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 699 | test_configured_prune false true unset unset pruned kept "" |
| 700 | test_configured_prune false true unset unset kept kept "--no-prune" |
| 701 | test_configured_prune false true unset unset pruned kept "--prune" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 702 | |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 703 | test_configured_prune true true unset unset pruned kept "" |
| 704 | test_configured_prune true true unset unset pruned kept "--prune" |
| 705 | test_configured_prune true true unset unset kept kept "--no-prune" |
| 706 | test_configured_prune true true unset unset kept pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 707 | "--prune origin refs/tags/*:refs/tags/*" |
Ævar Arnfjörð Bjarmason | e249ce0 | 2018-02-09 20:32:14 +0000 | [diff] [blame] | 708 | test_configured_prune true true unset unset pruned pruned \ |
Ævar Arnfjörð Bjarmason | 6fb23f5 | 2018-02-09 20:32:07 +0000 | [diff] [blame] | 709 | "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*" |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 710 | |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 711 | # --prune-tags on its own does nothing, needs --prune as well, same |
| 712 | # for for fetch.pruneTags without fetch.prune |
| 713 | test_configured_prune unset unset unset unset kept kept "--prune-tags" |
| 714 | test_configured_prune unset unset true unset kept kept "" |
| 715 | test_configured_prune unset unset unset true kept kept "" |
| 716 | |
| 717 | # These will prune the tags |
| 718 | test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags" |
| 719 | test_configured_prune true unset true unset pruned pruned "" |
| 720 | test_configured_prune unset true unset true pruned pruned "" |
| 721 | |
| 722 | # remote.<name>.pruneTags overrides fetch.pruneTags, just like |
| 723 | # remote.<name>.prune overrides fetch.prune if set. |
| 724 | test_configured_prune true unset true unset pruned pruned "" |
| 725 | test_configured_prune false true false true pruned pruned "" |
| 726 | test_configured_prune true false true false kept kept "" |
| 727 | |
| 728 | # When --prune-tags is supplied it's ignored if an explicit refspec is |
| 729 | # given, same for the configuration options. |
| 730 | test_configured_prune unset unset unset unset pruned kept \ |
| 731 | "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*" |
| 732 | test_configured_prune unset unset true unset pruned kept \ |
| 733 | "--prune origin +refs/heads/*:refs/remotes/origin/*" |
| 734 | test_configured_prune unset unset unset true pruned kept \ |
| 735 | "--prune origin +refs/heads/*:refs/remotes/origin/*" |
| 736 | |
| 737 | # 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] | 738 | # remote. However, because there's no implicit |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 739 | # +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the |
| 740 | # command-line negates --prune-tags, the branches will not be pruned. |
| 741 | test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name" |
| 742 | test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link" |
| 743 | 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] | 744 | 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] | 745 | 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] | 746 | 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] | 747 | test_configured_prune_type unset unset true unset pruned pruned "--prune origin" "name" |
| 748 | test_configured_prune_type unset unset true unset kept pruned "--prune origin" "link" |
| 749 | test_configured_prune_type unset unset unset true pruned pruned "--prune origin" "name" |
| 750 | test_configured_prune_type unset unset unset true kept pruned "--prune origin" "link" |
| 751 | test_configured_prune_type true unset true unset pruned pruned "origin" "name" |
| 752 | test_configured_prune_type true unset true unset kept pruned "origin" "link" |
| 753 | test_configured_prune_type unset true true unset pruned pruned "origin" "name" |
| 754 | test_configured_prune_type unset true true unset kept pruned "origin" "link" |
| 755 | test_configured_prune_type unset true unset true pruned pruned "origin" "name" |
| 756 | test_configured_prune_type unset true unset true kept pruned "origin" "link" |
| 757 | |
Ævar Arnfjörð Bjarmason | 6317972 | 2018-02-09 20:32:16 +0000 | [diff] [blame] | 758 | # When all remote.origin.fetch settings are deleted a --prune |
| 759 | # --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so |
| 760 | # tags, but not tracking branches, will be deleted. |
Ævar Arnfjörð Bjarmason | 97716d2 | 2018-02-09 20:32:15 +0000 | [diff] [blame] | 761 | test_expect_success 'remove remote.origin.fetch "one"' ' |
| 762 | ( |
| 763 | cd one && |
| 764 | git config --unset-all remote.origin.fetch |
| 765 | ) |
| 766 | ' |
| 767 | 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] | 768 | 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] | 769 | |
Thomas Rast | efe4be1 | 2012-03-01 22:40:51 +0100 | [diff] [blame] | 770 | test_expect_success 'all boundary commits are excluded' ' |
| 771 | test_commit base && |
| 772 | test_commit oneside && |
| 773 | git checkout HEAD^ && |
| 774 | test_commit otherside && |
| 775 | git checkout master && |
| 776 | test_tick && |
| 777 | git merge otherside && |
| 778 | ad=$(git log --no-walk --format=%ad HEAD) && |
| 779 | git bundle create twoside-boundary.bdl master --since="$ad" && |
| 780 | convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack && |
| 781 | pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) && |
| 782 | test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3 |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 783 | ' |
| 784 | |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 785 | test_expect_success 'fetch --prune prints the remotes url' ' |
| 786 | git branch goodbye && |
| 787 | git clone . only-prunes && |
| 788 | git branch -D goodbye && |
| 789 | ( |
| 790 | cd only-prunes && |
| 791 | git fetch --prune origin 2>&1 | head -n1 >../actual |
| 792 | ) && |
| 793 | echo "From ${D}/." >expect && |
Vasco Almeida | 1edbaac | 2016-06-17 20:21:07 +0000 | [diff] [blame] | 794 | test_i18ncmp expect actual |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 795 | ' |
| 796 | |
Tom Miller | 10a6cc8 | 2014-01-02 20:28:52 -0600 | [diff] [blame] | 797 | test_expect_success 'branchname D/F conflict resolved by --prune' ' |
| 798 | git branch dir/file && |
| 799 | git clone . prune-df-conflict && |
| 800 | git branch -D dir/file && |
| 801 | git branch dir && |
| 802 | ( |
| 803 | cd prune-df-conflict && |
| 804 | git fetch --prune && |
| 805 | git rev-parse origin/dir >../actual |
| 806 | ) && |
| 807 | git rev-parse dir >expect && |
| 808 | test_cmp expect actual |
| 809 | ' |
| 810 | |
Jeff King | 4c22408 | 2014-01-15 05:46:13 -0500 | [diff] [blame] | 811 | test_expect_success 'fetching a one-level ref works' ' |
| 812 | test_commit extra && |
| 813 | git reset --hard HEAD^ && |
| 814 | git update-ref refs/foo extra && |
| 815 | git init one-level && |
| 816 | ( |
| 817 | cd one-level && |
| 818 | git fetch .. HEAD refs/foo |
| 819 | ) |
| 820 | ' |
| 821 | |
Johannes Schindelin | 0898c96 | 2016-01-13 18:20:11 +0100 | [diff] [blame] | 822 | test_expect_success 'fetching with auto-gc does not lock up' ' |
| 823 | write_script askyesno <<-\EOF && |
| 824 | echo "$*" && |
| 825 | false |
| 826 | EOF |
| 827 | git clone "file://$D" auto-gc && |
| 828 | test_commit test2 && |
Michael J Gruber | 816c193 | 2016-03-04 11:53:50 +0100 | [diff] [blame] | 829 | ( |
| 830 | cd auto-gc && |
Kim Gybels | 12e73a3 | 2018-07-09 22:37:27 +0200 | [diff] [blame^] | 831 | git config fetch.unpackLimit 1 && |
Michael J Gruber | 816c193 | 2016-03-04 11:53:50 +0100 | [diff] [blame] | 832 | git config gc.autoPackLimit 1 && |
SZEDER Gábor | bb05510 | 2016-05-01 17:37:43 +0200 | [diff] [blame] | 833 | git config gc.autoDetach false && |
Michael J Gruber | 816c193 | 2016-03-04 11:53:50 +0100 | [diff] [blame] | 834 | GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 && |
Kim Gybels | 12e73a3 | 2018-07-09 22:37:27 +0200 | [diff] [blame^] | 835 | test_i18ngrep "Auto packing the repository" fetch.out && |
Michael J Gruber | 816c193 | 2016-03-04 11:53:50 +0100 | [diff] [blame] | 836 | ! grep "Should I try again" fetch.out |
| 837 | ) |
Johannes Schindelin | 0898c96 | 2016-01-13 18:20:11 +0100 | [diff] [blame] | 838 | ' |
| 839 | |
Vasco Almeida | 377d7de | 2016-07-26 12:58:54 +0000 | [diff] [blame] | 840 | 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] | 841 | git clone . full-output && |
| 842 | test_commit looooooooooooong-tag && |
| 843 | ( |
| 844 | cd full-output && |
Pratik Karki | a4d4e32 | 2018-03-27 23:16:37 +0545 | [diff] [blame] | 845 | git -c fetch.output=full fetch origin >actual 2>&1 && |
| 846 | grep -e "->" actual | cut -c 22- >../actual |
Nguyễn Thái Ngọc Duy | 6bc91f2 | 2016-07-01 18:03:30 +0200 | [diff] [blame] | 847 | ) && |
| 848 | cat >expect <<-\EOF && |
| 849 | master -> origin/master |
| 850 | looooooooooooong-tag -> looooooooooooong-tag |
| 851 | EOF |
| 852 | test_cmp expect actual |
| 853 | ' |
| 854 | |
Vasco Almeida | 377d7de | 2016-07-26 12:58:54 +0000 | [diff] [blame] | 855 | 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] | 856 | git clone . compact && |
| 857 | test_commit extraaa && |
| 858 | ( |
| 859 | cd compact && |
Pratik Karki | a4d4e32 | 2018-03-27 23:16:37 +0545 | [diff] [blame] | 860 | git -c fetch.output=compact fetch origin >actual 2>&1 && |
| 861 | grep -e "->" actual | cut -c 22- >../actual |
Nguyễn Thái Ngọc Duy | bc437d1 | 2016-07-01 18:03:31 +0200 | [diff] [blame] | 862 | ) && |
| 863 | cat >expect <<-\EOF && |
| 864 | master -> origin/* |
| 865 | extraaa -> * |
| 866 | EOF |
| 867 | test_cmp expect actual |
| 868 | ' |
| 869 | |
Junio C Hamano | 7be1d62 | 2006-09-23 03:40:17 -0700 | [diff] [blame] | 870 | test_done |