From nobody Fri Dec 2 08:04:05 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NNlnz4Jfjz4jgcS for ; Fri, 2 Dec 2022 08:04:07 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NNlnz2RfFz3vrm for ; Fri, 2 Dec 2022 08:04:07 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669968247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=NCZfFBgagccSk2rQc28Lm8F6yhQ7b6WXlApk2rKU+Bc=; b=V2hnTwzsO+zG0Bg1TTtF8iZAw5EwBJfGb+dt+RGIic7EShi0Z3pj4PPrNGf36nTTaVz/b9 olVO83uFUxfEySy5KnfJkJT/SKisvXm9rFM5lgD3VvdgRvotqKyv+5xrfaTmIr0iutRTi3 /5NHXgEy9Ht8n+Tie4SUwQgdpyHeVFKxI4rIud+vtThom+MO9xnS+Oi6Ss16FO8piefxxq 5KVFSLu1+vcpFsRX/E3qkHDG1nbmQn/pYpJam7aXocv2Q5wiIpZtGa6un5L9R8g62QZxzR LapyLuIfAS+qiv2+ItM51NQuEKFikhI9jXV2R8ejxHFGDLqPfTnutVRnYco04g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669968247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=NCZfFBgagccSk2rQc28Lm8F6yhQ7b6WXlApk2rKU+Bc=; b=XrTz6lUIz4k+cWzaGO6ASLhTm/MFr4TAXeZ5N9hu5nvt4iQruP6iHLxuWnCYxBL8pA/nFL QtXGWLv3c14NJYGvQ5t3DFJrj8Wlugbm9Pc9KdWJw8V9GkPAxn6qEPGhTKNcRQQ837/Tpk /2P8ti0o7y8wSy08cbZZTscMnonaTQOlLKNHC/4IRvBh9zSLHIKi0vij45EHjR2F6/WOQt Oifx40FPZ+XZTGblgPFJGrIFGI7yMA/XWgZLtpyMwqirHYjNrYrlHPbrnkHHPO+QcqpAMk kCQi43QEaRw7qJ0IktXKJ0iSZ0Q8cWs2V7l6XCSTCnDUEbPPdjHxolQUsHo2Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669968247; a=rsa-sha256; cv=none; b=c1OKS/EGPWRNjLkYFxEwqNJFY73wPjnrMh7GEeWUqLcNn25lusBpItWtMmI2RXalCOWn4N GfijyLpYTrSKvr/ZNo2t0MK48hn7W1KGjGkmGVb248cjlN4UzTS02v3qDDMibhd0T+02PD ZpZspw6YLFet8JzePbu+fTQ2MPTVybFRf5ebuXvPEkaeSD7avIOjTZ+ZoNLk8qgVfDMyq6 A0HwTKa3sBHz+AVAr2FpFYC+xwURnwKy5Uepdv3mEPQDtvF+eEiWzDPVtdYRpJLHCkkFvG hVLZdbFSHJPYG5U7adTFFxIXDIlBWoy3vUj1cQnofkGpnhPDiUemAa2ycrveYQ== Received: from [IPV6:2001:470:1f1c:a0::2] (tunnel642390-pt.tunnel.tserv1.lon2.ipv6.he.net [IPv6:2001:470:1f1c:a0::2]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: grahamperrin) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NNlny6lF5zWcx for ; Fri, 2 Dec 2022 08:04:06 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Message-ID: Date: Fri, 2 Dec 2022 08:04:05 +0000 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 To: freebsd-git@freebsd.org Content-Language: en-GB From: Graham Perrin Subject: git-switch(1) then git-pull(1) Organization: FreeBSD Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Q41vEk09c0jfIzHNhbvXwlFF" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Q41vEk09c0jfIzHNhbvXwlFF Content-Type: multipart/mixed; boundary="------------IyQDwhb0CFG4i1eUHANbPRB2"; protected-headers="v1" From: Graham Perrin To: freebsd-git@freebsd.org Message-ID: 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

I'm confused.

If a switch is intended to update things, then how can an immediately subsequent pull lead to updates?


% git -C /usr/ports switch main &&= ; git -C /usr/src switch main
Already on 'main'
Your branch is up to date with 'freebsd/main'.
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/hci/= ng_hci_cmds.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/hci/= ng_hci_evnt.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/incl= ude/ng_hci.h
Already on 'main'
Your branch is up to date with 'origin/main'.
% git -C /usr/ports pull --ff-only && git -C /usr/src pull --ff-only
remote: Enumerating objects: 3284, done.
remote: Counting objects: 100% (840/840), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3284 (delta 837), reused 837 (delta 837), pack-reused 2444
Receiving objects: 100% (3284/3284), 1.92 MiB | 1.11 MiB/s, done.
Resolving deltas: 100% (1985/1985), completed with 474 local objects.
From https://git.freebsd.org/ports
=C2=A0=C2=A0 fb6a9af3e898..80afc63eeb99=C2=A0 main=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 -> freebsd/main
=C2=A0=C2=A0 749ca3ec2e60..c3552efe398e=C2=A0 2022Q4=C2=A0=C2=A0=C2= =A0=C2=A0 -> freebsd/2022Q4
Updating fb6a9af3e898..80afc63eeb99
^C
% cat /usr/ports/.git/config
[core]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 repositoryformatversio= n =3D 0
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 filemode =3D true
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bare =3D false
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 logallrefupdates =3D t= rue
[remote "freebsd"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 url =3D https://g= it.freebsd.org/ports.git
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fetch =3D +refs/heads/= *:refs/remotes/freebsd/*
[branch "main"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 remote =3D freebsd
= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 merge =3D refs/heads/m= ain
%

Git - git-switch Documentation

--------------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--