Date: Sat, 3 Dec 2022 01:19:44 +0000 From: Graham Perrin <grahamperrin@freebsd.org> To: freebsd-git@freebsd.org Subject: Re: git-switch(1) then git-pull(1) Message-ID: <db9ddb93-c40f-8c3d-7cf3-5a7342255193@freebsd.org> In-Reply-To: <CAFDf7UJWWHKqAGFWdQHfXTH=H=c0vF1pf1X%2BZO78iDtiL3E=cg@mail.gmail.com> References: <ef399d4c-cb26-2bff-9966-684d3a7b96ad@freebsd.org> <CAFDf7UJWWHKqAGFWdQHfXTH=H=c0vF1pf1X%2BZO78iDtiL3E=cg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Zjz9GC25O3bSmHHzkRfCEJYM Content-Type: multipart/mixed; boundary="------------HQxejgomF7DXUpF0aLiKU3AD"; protected-headers="v1" From: Graham Perrin <grahamperrin@freebsd.org> To: freebsd-git@freebsd.org Message-ID: <db9ddb93-c40f-8c3d-7cf3-5a7342255193@freebsd.org> Subject: Re: git-switch(1) then git-pull(1) References: <ef399d4c-cb26-2bff-9966-684d3a7b96ad@freebsd.org> <CAFDf7UJWWHKqAGFWdQHfXTH=H=c0vF1pf1X+ZO78iDtiL3E=cg@mail.gmail.com> In-Reply-To: <CAFDf7UJWWHKqAGFWdQHfXTH=H=c0vF1pf1X+ZO78iDtiL3E=cg@mail.gmail.com> --------------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 <html data-lt-installed=3D"true"> <head> <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF= -8"> </head> <body> <div class=3D"moz-cite-prefix">On 02/12/2022 12:08, Nuno Teixeira wrote:<br> </div> <blockquote type=3D"cite" cite=3D"mid:CAFDf7UJWWHKqAGFWdQHfXTH=3DH=3Dc0vF1pf1X+ZO78iDtiL3E=3Dcg@mai= l.gmail.com"> <meta http-equiv=3D"content-type" content=3D"text/html; charset=3DU= TF-8"> <div dir=3D"ltr"> <div>Not sure if I understand but I use `git switch` on ports tree to switch from 'main' to 'quarterly' to avoid having 2 trees.</div> <div><br> </div> <div>e.g.</div> <div>When in main and need to do a commit on 2022Q4:</div> <div>`git switch 2022Q4`</div> <div>`git pull --rebase`</div> <div>`git cherry-pick -x XXX`</div> <div>`git push`</div> <div><br> </div> <div>and switch back to main:</div> <div>`git switch -` or `git switch main`</div> <div>`git pull --rebase`</div> <div><br> </div> <div>Hope that helps<br> </div> </div> </blockquote> <p>There's the statement after the switch: <br> </p> <p>"up to date"</p> <p>If the branch is <i>truly</i> updated, then what are the subsequent updates? (The pull immediately after the switch.)<br> </p> <p><br> </p> <blockquote type=3D"cite" cite=3D"mid:CAFDf7UJWWHKqAGFWdQHfXTH=3DH=3Dc0vF1pf1X+ZO78iDtiL3E=3Dcg@mai= l.gmail.com">Graham Perrin <<a href=3D"mailto:grahamperrin@freebsd.org" moz-do-not-send=3D"true" class=3D"moz-txt-link-freetext">grahampe= rrin@freebsd.org</a>> escreveu no dia sexta, 2/12/2022 =C3=A0(s) 08:04:<br> <div class=3D"gmail_quote"> <blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">= <div> <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 && 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/blueto= oth/hci/ng_hci_cmds.c<br> M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/blueto= oth/hci/ng_hci_evnt.c<br> M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/blueto= oth/include/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 && 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 href=3D"https://git.freebsd.org/ports" target=3D"_blank" moz-do-not-send=3D"true" class=3D"moz-txt-link-freetext">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 -> freebsd/main<br> =C2=A0=C2=A0 749ca3ec2e60..c3552efe398e=C2=A0 2022Q4=C2=A0= =C2=A0=C2=A0=C2=A0 -> 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 repositoryform= atversion =3D 0<br> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 filemode =3D t= rue<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 logallrefupdat= es =3D true<br> [remote "freebsd"]<br> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 url =3D <a href=3D"https://git.freebsd.org/ports.git" target=3D"_blank" moz-do-not-send=3D"true" class=3D"moz-txt-link-freetext">https://git.freebsd.org= /ports.git</a><br> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fetch =3D +ref= s/heads/*:refs/remotes/freebsd/*<br> [branch "main"]<br> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 remote =3D fre= ebsd<br> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 merge =3D refs= /heads/main<br> % </font><br> </p> <p><a href=3D"https://git-scm.com/docs/git-switch" target=3D"_blank" moz-do-not-send=3D"true">Git - git-swit= ch Documentation</a></p> </div> </blockquote> </div> <br clear=3D"all"> <br> -- <br> <div dir=3D"ltr" class=3D"gmail_signature"> <div dir=3D"ltr"><span style=3D"color:rgb(102,102,102)">Nuno Teixeira<br> FreeBSD Committer (ports)</span></div> </div> </blockquote> </body> <lt-container></lt-container> </html> --------------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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?db9ddb93-c40f-8c3d-7cf3-5a7342255193>