Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 2 Dec 2022 08:04:05 +0000
From:      Graham Perrin <grahamperrin@freebsd.org>
To:        freebsd-git@freebsd.org
Subject:   git-switch(1) then git-pull(1)
Message-ID:  <ef399d4c-cb26-2bff-9966-684d3a7b96ad@freebsd.org>
next in thread | raw e-mail | index | archive | help 
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--------------Q41vEk09c0jfIzHNhbvXwlFF
Content-Type: multipart/mixed; boundary="------------IyQDwhb0CFG4i1eUHANbPRB2";
 protected-headers="v1"
From: Graham Perrin <grahamperrin@freebsd.org>
To: freebsd-git@freebsd.org
Message-ID: <ef399d4c-cb26-2bff-9966-684d3a7b96ad@freebsd.org>
Subject: git-switch(1) then git-pull(1)

--------------IyQDwhb0CFG4i1eUHANbPRB2
Content-Type: multipart/alternative;
 boundary="------------x3VUWjhvFZDByAzVn0oK8QYi"

--------------x3VUWjhvFZDByAzVn0oK8QYi
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: base64

SSdtIGNvbmZ1c2VkLg0KDQpJZiBhIHN3aXRjaCBpcyBpbnRlbmRlZCB0byB1cGRhdGUgdGhp
bmdzLCB0aGVuIGhvdyBjYW4gYW4gaW1tZWRpYXRlbHkgDQpzdWJzZXF1ZW50IHB1bGwgbGVh
ZCB0byB1cGRhdGVzPw0KDQoNCiUgZ2l0IC1DIC91c3IvcG9ydHMgc3dpdGNoIG1haW4gJiYg
Z2l0IC1DIC91c3Ivc3JjIHN3aXRjaCBtYWluDQpBbHJlYWR5IG9uICdtYWluJw0KWW91ciBi
cmFuY2ggaXMgdXAgdG8gZGF0ZSB3aXRoICdmcmVlYnNkL21haW4nLg0KTcKgwqDCoMKgwqDC
oCBzeXMvbmV0Z3JhcGgvYmx1ZXRvb3RoL2hjaS9uZ19oY2lfY21kcy5jDQpNwqDCoMKgwqDC
oMKgIHN5cy9uZXRncmFwaC9ibHVldG9vdGgvaGNpL25nX2hjaV9ldm50LmMNCk3CoMKgwqDC
oMKgwqAgc3lzL25ldGdyYXBoL2JsdWV0b290aC9pbmNsdWRlL25nX2hjaS5oDQpBbHJlYWR5
IG9uICdtYWluJw0KWW91ciBicmFuY2ggaXMgdXAgdG8gZGF0ZSB3aXRoICdvcmlnaW4vbWFp
bicuDQolIGdpdCAtQyAvdXNyL3BvcnRzIHB1bGwgLS1mZi1vbmx5ICYmIGdpdCAtQyAvdXNy
L3NyYyBwdWxsIC0tZmYtb25seQ0KcmVtb3RlOiBFbnVtZXJhdGluZyBvYmplY3RzOiAzMjg0
LCBkb25lLg0KcmVtb3RlOiBDb3VudGluZyBvYmplY3RzOiAxMDAlICg4NDAvODQwKSwgZG9u
ZS4NCnJlbW90ZTogQ29tcHJlc3Npbmcgb2JqZWN0czogMTAwJSAoMy8zKSwgZG9uZS4NCnJl
bW90ZTogVG90YWwgMzI4NCAoZGVsdGEgODM3KSwgcmV1c2VkIDgzNyAoZGVsdGEgODM3KSwg
cGFjay1yZXVzZWQgMjQ0NA0KUmVjZWl2aW5nIG9iamVjdHM6IDEwMCUgKDMyODQvMzI4NCks
IDEuOTIgTWlCIHwgMS4xMSBNaUIvcywgZG9uZS4NClJlc29sdmluZyBkZWx0YXM6IDEwMCUg
KDE5ODUvMTk4NSksIGNvbXBsZXRlZCB3aXRoIDQ3NCBsb2NhbCBvYmplY3RzLg0KIEZyb20g
aHR0cHM6Ly9naXQuZnJlZWJzZC5vcmcvcG9ydHMNCiDCoMKgIGZiNmE5YWYzZTg5OC4uODBh
ZmM2M2VlYjk5wqAgbWFpbsKgwqDCoMKgwqDCoCAtPiBmcmVlYnNkL21haW4NCiDCoMKgIDc0
OWNhM2VjMmU2MC4uYzM1NTJlZmUzOThlwqAgMjAyMlE0wqDCoMKgwqAgLT4gZnJlZWJzZC8y
MDIyUTQNClVwZGF0aW5nIGZiNmE5YWYzZTg5OC4uODBhZmM2M2VlYjk5DQpeQw0KJSBjYXQg
L3Vzci9wb3J0cy8uZ2l0L2NvbmZpZw0KW2NvcmVdDQogwqDCoMKgwqDCoMKgwqAgcmVwb3Np
dG9yeWZvcm1hdHZlcnNpb24gPSAwDQogwqDCoMKgwqDCoMKgwqAgZmlsZW1vZGUgPSB0cnVl
DQogwqDCoMKgwqDCoMKgwqAgYmFyZSA9IGZhbHNlDQogwqDCoMKgwqDCoMKgwqAgbG9nYWxs
cmVmdXBkYXRlcyA9IHRydWUNCltyZW1vdGUgImZyZWVic2QiXQ0KIMKgwqDCoMKgwqDCoMKg
IHVybCA9IGh0dHBzOi8vZ2l0LmZyZWVic2Qub3JnL3BvcnRzLmdpdA0KIMKgwqDCoMKgwqDC
oMKgIGZldGNoID0gK3JlZnMvaGVhZHMvKjpyZWZzL3JlbW90ZXMvZnJlZWJzZC8qDQpbYnJh
bmNoICJtYWluIl0NCiDCoMKgwqDCoMKgwqDCoCByZW1vdGUgPSBmcmVlYnNkDQogwqDCoMKg
wqDCoMKgwqAgbWVyZ2UgPSByZWZzL2hlYWRzL21haW4NCiUNCg0KR2l0IC0gZ2l0LXN3aXRj
aCBEb2N1bWVudGF0aW9uIDxodHRwczovL2dpdC1zY20uY29tL2RvY3MvZ2l0LXN3aXRjaD4N
Cg0K
--------------x3VUWjhvFZDByAzVn0oK8QYi
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<html data-lt-installed=3D"true">
  <head>

    <meta http-equiv=3D"content-type" content=3D"text/html; charset=3DUTF=
-8">
  </head>
  <body>
    <p>I'm confused. <br>
    </p>
    <p>If a switch is intended to update things, then how can an
      immediately subsequent pull lead to updates?</p>
    <p><br>
    </p>
    <p><font face=3D"monospace">% git -C /usr/ports switch main &amp;&amp=
;
        git -C /usr/src switch main<br>
        Already on 'main'<br>
        Your branch is up to date with 'freebsd/main'.<br>
        M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/hci/=
ng_hci_cmds.c<br>
        M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/hci/=
ng_hci_evnt.c<br>
        M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/incl=
ude/ng_hci.h<br>
        Already on 'main'<br>
        Your branch is up to date with 'origin/main'.<br>
        % git -C /usr/ports pull --ff-only &amp;&amp; git -C /usr/src
        pull --ff-only<br>
        remote: Enumerating objects: 3284, done.<br>
        remote: Counting objects: 100% (840/840), done.<br>
        remote: Compressing objects: 100% (3/3), done.<br>
        remote: Total 3284 (delta 837), reused 837 (delta 837),
        pack-reused 2444<br>
        Receiving objects: 100% (3284/3284), 1.92 MiB | 1.11 MiB/s,
        done.<br>
        Resolving deltas: 100% (1985/1985), completed with 474 local
        objects.<br>
        From <a class=3D"moz-txt-link-freetext" href=3D"https://git.freeb=
sd.org/ports">https://git.freebsd.org/ports</a><br>;
        =C2=A0=C2=A0 fb6a9af3e898..80afc63eeb99=C2=A0 main=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 -&gt; freebsd/main<br>
        =C2=A0=C2=A0 749ca3ec2e60..c3552efe398e=C2=A0 2022Q4=C2=A0=C2=A0=C2=
=A0=C2=A0 -&gt; freebsd/2022Q4<br>
        Updating fb6a9af3e898..80afc63eeb99<br>
        ^C<br>
        % cat /usr/ports/.git/config<br>
        [core]<br>
        =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 repositoryformatversio=
n =3D 0<br>
        =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 filemode =3D true<br>
        =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bare =3D false<br>
        =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 logallrefupdates =3D t=
rue<br>
        [remote "freebsd"]<br>
        =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 url =3D <a class=3D"mo=
z-txt-link-freetext" href=3D"https://git.freebsd.org/ports.git">https://g=
it.freebsd.org/ports.git</a><br>
        =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fetch =3D +refs/heads/=
*:refs/remotes/freebsd/*<br>
        [branch "main"]<br>
        =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 remote =3D freebsd<br>=

        =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 merge =3D refs/heads/m=
ain<br>
        % </font><br>
    </p>
    <p><a href=3D"https://git-scm.com/docs/git-switch">Git - git-switch
        Documentation</a></p>
  </body>
  <lt-container></lt-container>
</html>

--------------x3VUWjhvFZDByAzVn0oK8QYi--

--------------IyQDwhb0CFG4i1eUHANbPRB2--

--------------Q41vEk09c0jfIzHNhbvXwlFF
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"

-----BEGIN PGP SIGNATURE-----

wsF5BAABCAAjFiEEWT/lssMHB+28ly8Kt2dIb0oY1AsFAmOJsXUFAwAAAAAACgkQt2dIb0oY1AuP
4BAAl46+mYoYydWyP3tIMQGHRMiiQjF5wmQLPaU5ux7tYB++c36soywS8esnng9QNTKjVmqxH24j
ccl1NwTw1T5pWZ6mEUa5VcGisCmSZbcX1bq4q10ZMVX1BKHq/gLBd7vQolkdy8ZGYnri5J9kUwEW
pQPU4gmSsEskmfRXpJdnjzrv33qsJbU8EQjMDXQPWNTcwaFh+7UkUNQWYxOfHJNG4whsC+dao2DA
z5oS0cgwSKKAbfTAQ/T11eIOL7t7O5SY43XjQ+jIgNljBoKcMyERcPbJAyrG4WwrLZVU/jxnacz/
pL13WR3fbDgosAZXkfnh9nNQ35N872G/QiGK5hL5O1sVFz2elPmigD85epg1241ZzZL56dSizjzu
ef/cJQIRHO78qujxZo8IDdfJJvXYGoL+P0mgA2Dx7G23cho/M5JQbR2R6rTjDmijY3Y9krrf50d8
Dm+wNNV6u62LpT1NYDEjGMM2ZD4VootQHbYyTaAjVXfU77vpkj9pqNg04+xeXv435l6jddTUiB0B
0AorPk2wlXgKoJl+G2N5BciAglFag+Iq3vxpP3mlFGE9b7It32cWS2nJ3B74Q3d/7pdkNhXTKVud
yVYfInJwdnVevEauVXU4sNpWcFHzi+JNWutiYo5FsIsobPOM/WqxSEKP6aZxwp9mzzGPAIttdKZ+
WXY=
=kwld
-----END PGP SIGNATURE-----

--------------Q41vEk09c0jfIzHNhbvXwlFF--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ef399d4c-cb26-2bff-9966-684d3a7b96ad>