From nobody Sat Dec 03 01:19:44 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 4NPBmz1TQkz4hxCn for ; Sat, 3 Dec 2022 01:19:47 +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 4NPBmz0wcsz3JBW for ; Sat, 3 Dec 2022 01:19:47 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670030387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1F6IoEnhEad3TJCcO7mfgMWiqaKugUGn6KGlsEoWtZE=; b=H89tIH7Q/bX8tS9LziEQ3Z3zrgfFGx102X7ptUT1st/oRqVCWnh12q4Ece3km6/3ICKSey SmXtuEoMQdZYrsVQ+9SgzOm8QFqk754+iY+vbVlnQJ5jOCiX4SUe0+I4dYx08GWgmELZoT 5PmySnVZReDDelgQRkOJCiKNlq8wbwXUv7383K846298kl99JWcX9hf8VeMfpDe+XrfX5Y 5Jqlj1QJSl2uI3K37+VJXG8wtJP+m2diBtHJyaqhIVKKZNt7sHJqea0fgDeeU9b0ZIYA0t ytTIfxqOMvkVxsy7mS2honzFx6lV1FggZnlaCbAFtmSTcE8wIgFNVxCL72421w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670030387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1F6IoEnhEad3TJCcO7mfgMWiqaKugUGn6KGlsEoWtZE=; b=MZ7c2GQmWC9n0d5TjL3quzLvYkrDt8GmsaWReLtlONtSqEPM3Y0fj64fihQiOoGsGHICzC E4JULkt6mrFOnLU0veDBN07GWD3p+pEKsl7mxdBcYI+Nf68nxDqdiW6digcFfjIMLHFNUy G7VF+0jCyrG45+QHBaTX1gNjaQg1/m9LgNM9YJihatbTpSRyv7FZyTjcCXtIwlNKDkQljP h803n0e+FDbc064ii6A6n4VuA/4TiT80S8ppmFJ/dI5NUk4Cv5GpDtiPdyiTuE/9v8+n+m xnpBeh+wqKSGwPjsJh3KFWRsyBKEJO16m3+jlr7VnY+lZaPrn4D/EAhnUnvPdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670030387; a=rsa-sha256; cv=none; b=E1GPn2MWnPQ1DNRdbz/DrUU1h+PUuFvCWFMB3CzLabsbzFVThhpYfpkg47hLp42WU0x3gg vhR1qhN1WxDZ1uTEMb6aAQ+Rzr4Y1/RUqg57jrptjUaniyqrWwL6SNWnDAR6lvVYSfbwe7 z3MfYru0irl0bfdeB8cH5jCbpaNiE+c85rIhST3VcbjeQ0W3MhWVW9XE9Rpi4z+hG+EjuD jsNkJi5+TKkb8qDAMKjofHxSxUf0S69YfHWfuP3iR9W9xJOUKsp+Jfcb0qFtzLxKzYrGMN 3v4P8Awi72kUUqoyAc+u9I7a85dsBJxySe2Zq4WVR8xn8ELqczK3EyCT3lC5oA== 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) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: grahamperrin) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NPBmy53YVzsp3 for ; Sat, 3 Dec 2022 01:19:46 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Message-ID: Date: Sat, 3 Dec 2022 01:19:44 +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 Subject: Re: git-switch(1) then git-pull(1) References: Content-Language: en-GB To: freebsd-git@freebsd.org From: Graham Perrin Organization: FreeBSD In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Zjz9GC25O3bSmHHzkRfCEJYM" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Zjz9GC25O3bSmHHzkRfCEJYM Content-Type: multipart/mixed; boundary="------------HQxejgomF7DXUpF0aLiKU3AD"; protected-headers="v1" From: Graham Perrin To: freebsd-git@freebsd.org Message-ID: Subject: Re: git-switch(1) then git-pull(1) References: In-Reply-To: --------------HQxejgomF7DXUpF0aLiKU3AD Content-Type: multipart/alternative; boundary="------------5eesFH8rVVfaiqXl0mpsGMIZ" --------------5eesFH8rVVfaiqXl0mpsGMIZ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMDIvMTIvMjAyMiAxMjowOCwgTnVubyBUZWl4ZWlyYSB3cm90ZToNCj4gTm90IHN1cmUg aWYgSSB1bmRlcnN0YW5kIGJ1dCBJIHVzZSBgZ2l0IHN3aXRjaGAgb24gcG9ydHMgdHJlZSB0 byANCj4gc3dpdGNoIGZyb20gJ21haW4nIHRvICdxdWFydGVybHknIHRvIGF2b2lkIGhhdmlu ZyAyIHRyZWVzLg0KPg0KPiBlLmcuDQo+IFdoZW4gaW4gbWFpbiBhbmQgbmVlZCB0byBkbyBh IGNvbW1pdCBvbiAyMDIyUTQ6DQo+IGBnaXQgc3dpdGNoIDIwMjJRNGANCj4gYGdpdCBwdWxs IC0tcmViYXNlYA0KPiBgZ2l0IGNoZXJyeS1waWNrIC14IFhYWGANCj4gYGdpdCBwdXNoYA0K Pg0KPiBhbmQgc3dpdGNoIGJhY2sgdG8gbWFpbjoNCj4gYGdpdCBzd2l0Y2ggLWAgb3IgYGdp dCBzd2l0Y2ggbWFpbmANCj4gYGdpdCBwdWxsIC0tcmViYXNlYA0KPg0KPiBIb3BlIHRoYXQg aGVscHMNCg0KVGhlcmUncyB0aGUgc3RhdGVtZW50IGFmdGVyIHRoZSBzd2l0Y2g6DQoNCiJ1 cCB0byBkYXRlIg0KDQpJZiB0aGUgYnJhbmNoIGlzIC90cnVseS8gdXBkYXRlZCwgdGhlbiB3 aGF0IGFyZSB0aGUgc3Vic2VxdWVudCB1cGRhdGVzPyANCihUaGUgcHVsbCBpbW1lZGlhdGVs eSBhZnRlciB0aGUgc3dpdGNoLikNCg0KDQo+IEdyYWhhbSBQZXJyaW4gPGdyYWhhbXBlcnJp bkBmcmVlYnNkLm9yZz4gZXNjcmV2ZXUgbm8gZGlhIHNleHRhLCANCj4gMi8xMi8yMDIyIMOg KHMpIDA4OjA0Og0KPg0KPiAgICAgSSdtIGNvbmZ1c2VkLg0KPg0KPiAgICAgSWYgYSBzd2l0 Y2ggaXMgaW50ZW5kZWQgdG8gdXBkYXRlIHRoaW5ncywgdGhlbiBob3cgY2FuIGFuDQo+ICAg ICBpbW1lZGlhdGVseSBzdWJzZXF1ZW50IHB1bGwgbGVhZCB0byB1cGRhdGVzPw0KPg0KPg0K PiAgICAgJSBnaXQgLUMgL3Vzci9wb3J0cyBzd2l0Y2ggbWFpbiAmJiBnaXQgLUMgL3Vzci9z cmMgc3dpdGNoIG1haW4NCj4gICAgIEFscmVhZHkgb24gJ21haW4nDQo+ICAgICBZb3VyIGJy YW5jaCBpcyB1cCB0byBkYXRlIHdpdGggJ2ZyZWVic2QvbWFpbicuDQo+ICAgICBNwqDCoMKg wqDCoMKgIHN5cy9uZXRncmFwaC9ibHVldG9vdGgvaGNpL25nX2hjaV9jbWRzLmMNCj4gICAg IE3CoMKgwqDCoMKgwqAgc3lzL25ldGdyYXBoL2JsdWV0b290aC9oY2kvbmdfaGNpX2V2bnQu Yw0KPiAgICAgTcKgwqDCoMKgwqDCoCBzeXMvbmV0Z3JhcGgvYmx1ZXRvb3RoL2luY2x1ZGUv bmdfaGNpLmgNCj4gICAgIEFscmVhZHkgb24gJ21haW4nDQo+ICAgICBZb3VyIGJyYW5jaCBp cyB1cCB0byBkYXRlIHdpdGggJ29yaWdpbi9tYWluJy4NCj4gICAgICUgZ2l0IC1DIC91c3Iv cG9ydHMgcHVsbCAtLWZmLW9ubHkgJiYgZ2l0IC1DIC91c3Ivc3JjIHB1bGwgLS1mZi1vbmx5 DQo+ICAgICByZW1vdGU6IEVudW1lcmF0aW5nIG9iamVjdHM6IDMyODQsIGRvbmUuDQo+ICAg ICByZW1vdGU6IENvdW50aW5nIG9iamVjdHM6IDEwMCUgKDg0MC84NDApLCBkb25lLg0KPiAg ICAgcmVtb3RlOiBDb21wcmVzc2luZyBvYmplY3RzOiAxMDAlICgzLzMpLCBkb25lLg0KPiAg ICAgcmVtb3RlOiBUb3RhbCAzMjg0IChkZWx0YSA4MzcpLCByZXVzZWQgODM3IChkZWx0YSA4 MzcpLA0KPiAgICAgcGFjay1yZXVzZWQgMjQ0NA0KPiAgICAgUmVjZWl2aW5nIG9iamVjdHM6 IDEwMCUgKDMyODQvMzI4NCksIDEuOTIgTWlCIHwgMS4xMSBNaUIvcywgZG9uZS4NCj4gICAg IFJlc29sdmluZyBkZWx0YXM6IDEwMCUgKDE5ODUvMTk4NSksIGNvbXBsZXRlZCB3aXRoIDQ3 NCBsb2NhbCBvYmplY3RzLg0KPiAgICAgRnJvbSBodHRwczovL2dpdC5mcmVlYnNkLm9yZy9w b3J0cw0KPiAgICAgwqDCoCBmYjZhOWFmM2U4OTguLjgwYWZjNjNlZWI5OcKgIG1haW7CoMKg wqDCoMKgwqAgLT4gZnJlZWJzZC9tYWluDQo+ICAgICDCoMKgIDc0OWNhM2VjMmU2MC4uYzM1 NTJlZmUzOThlwqAgMjAyMlE0wqDCoMKgwqAgLT4gZnJlZWJzZC8yMDIyUTQNCj4gICAgIFVw ZGF0aW5nIGZiNmE5YWYzZTg5OC4uODBhZmM2M2VlYjk5DQo+ICAgICBeQw0KPiAgICAgJSBj YXQgL3Vzci9wb3J0cy8uZ2l0L2NvbmZpZw0KPiAgICAgW2NvcmVdDQo+ICAgICDCoMKgwqDC oMKgwqDCoCByZXBvc2l0b3J5Zm9ybWF0dmVyc2lvbiA9IDANCj4gICAgIMKgwqDCoMKgwqDC oMKgIGZpbGVtb2RlID0gdHJ1ZQ0KPiAgICAgwqDCoMKgwqDCoMKgwqAgYmFyZSA9IGZhbHNl DQo+ICAgICDCoMKgwqDCoMKgwqDCoCBsb2dhbGxyZWZ1cGRhdGVzID0gdHJ1ZQ0KPiAgICAg W3JlbW90ZSAiZnJlZWJzZCJdDQo+ICAgICDCoMKgwqDCoMKgwqDCoCB1cmwgPSBodHRwczov L2dpdC5mcmVlYnNkLm9yZy9wb3J0cy5naXQNCj4gICAgIMKgwqDCoMKgwqDCoMKgIGZldGNo ID0gK3JlZnMvaGVhZHMvKjpyZWZzL3JlbW90ZXMvZnJlZWJzZC8qDQo+ICAgICBbYnJhbmNo ICJtYWluIl0NCj4gICAgIMKgwqDCoMKgwqDCoMKgIHJlbW90ZSA9IGZyZWVic2QNCj4gICAg IMKgwqDCoMKgwqDCoMKgIG1lcmdlID0gcmVmcy9oZWFkcy9tYWluDQo+ICAgICAlDQo+DQo+ ICAgICBHaXQgLSBnaXQtc3dpdGNoIERvY3VtZW50YXRpb24gPGh0dHBzOi8vZ2l0LXNjbS5j b20vZG9jcy9naXQtc3dpdGNoPg0KPg0KPg0KPg0KPiAtLSANCj4gTnVubyBUZWl4ZWlyYQ0K PiBGcmVlQlNEIENvbW1pdHRlciAocG9ydHMpDQo= --------------5eesFH8rVVfaiqXl0mpsGMIZ Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On 02/12/2022 12:08, Nuno Teixeira wrote:
Not sure if I understand but I use `git switch` on ports tree to switch from 'main' to 'quarterly' to avoid having 2 trees.

e.g.
When in main and need to do a commit on 2022Q4:
`git switch 2022Q4`
`git pull --rebase`
`git cherry-pick -x XXX`
`git push`

and switch back to main:
`git switch -` or `git switch main`
`git pull --rebase`

Hope that helps

There's the statement after the switch:

"up to date"

If the branch is truly updated, then what are the subsequent updates? (The pull immediately after the switch.)


Graham Perrin <grahampe= rrin@freebsd.org> escreveu no dia sexta, 2/12/2022 =C3=A0(s) 08:04:
=

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/blueto= oth/hci/ng_hci_cmds.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/blueto= oth/hci/ng_hci_evnt.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/blueto= oth/include/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 repositoryform= atversion =3D 0
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 filemode =3D t= rue
=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 logallrefupdat= es =3D true
[remote "freebsd"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 url =3D https://git.freebsd.org= /ports.git
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fetch =3D +ref= s/heads/*:refs/remotes/freebsd/*
[branch "main"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 remote =3D fre= ebsd
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 merge =3D refs= /heads/main
%

Git - git-swit= ch Documentation



--
Nuno Teixeira
FreeBSD Committer (ports)
--------------5eesFH8rVVfaiqXl0mpsGMIZ-- --------------HQxejgomF7DXUpF0aLiKU3AD-- --------------Zjz9GC25O3bSmHHzkRfCEJYM 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+28ly8Kt2dIb0oY1AsFAmOKpDAFAwAAAAAACgkQt2dIb0oY1Asc og//by9MJv75TqlJl6I9uuTvR7albK91upevp9I6NGI1wvVvGHtYJgl0kmISxoiakyQ47ie5zH4h ir/17JiBoZCFLia0jP1fHsaHE1ZSMg0loAJkduJb85FsTH6N9Os0uZuRUqaWz07D50TsJbPWJeEt DtJJmajEiag5yzF2T4eoCysrXlbTRdbOs+K13qtnCAuB8bsBTmAdY4GLXt+GutvPd8LhTMSoa521 w8JewkDiCluEiirw2nWZbi04Id+sWRMJADxNGaO8OICKa1TvdHNJs0KcIpT9Fc7P5Cyi90mBJ2xG wzvLIX5uoYN67iNsdRveBEHIAHzLvAnuhS2J3NEk6EfiVZTJuFke/DE+HMy3sCzaoDZ9dJ7Sq0RX 65VD1NkV2jXXRXvBaRijRBVgvS6Gv+91MKHPqUZqYNsQojaY0GitlW0rqXMMHXiRgsGMxTE+pSyi Rtm3+GjdyHiTivobz5TjoaZl2RhXH1zyouw7WUMFMU1fFrSbfwpaKP7UuIh8vYkb2yPvcws8lXIE atW4bBaLsNsr39TVjxL6kJ/gqYscmxCYBhi24siNCOCOqN1XzuQk25Vqk14luNCLwMxyrfvVUB/j 7t4CPn/8fzfZVFuxZlDJdsL1zNz4yYDVhnjEsL0kzNI6NjsIG0HGBVxfoWmZj+RQ6D9fX+JoneXY E4s= =kyqf -----END PGP SIGNATURE----- --------------Zjz9GC25O3bSmHHzkRfCEJYM--