From: Mark Jamsek Subject: Re: special case 'got fetch -b ' + regress To: Game of Trees Date: Mon, 13 Feb 2023 17:14:05 +1100 On 23-02-13 02:23AM, Mark Jamsek wrote: > As discussed with stsp on irc, the following diff special cases > 'got fetch -b' to _only_ fetch the specified branch, unlike the > remaining fetch cases (e.g., with{,out} branches set in got.conf and > with{,out} implicit work tree branch) where we fallback to the remote > HEAD branch if the branches in got.conf or the work tree are either not > set or do not exist on the remote. I think the below change to got.1 might make the new fetch behaviour clear: 197 By default, any branches configured in got.conf(5) for the 198 remote-repository will be fetched. If got fetch is invoked in 199 a work tree then this work tree's current branch will be 200 fetched, too, provided it is present on the server. If no 201 branches to fetch can be found in got.conf(5) or via a work 202 tree, or said branches are not found on the server, a branch 203 resolved via the remote repository's HEAD reference will be 204 fetched. This default behaviour can be overridden with the -a 205 and -b options. diff /home/mark/src/got commit - 4ca1d49293e9f718c256fae6f53499818a3addcd path + /home/mark/src/got blob - d3ce58fd68ab0a1ef9be75ee3b113fb0080db8db file + got/got.1 --- got/got.1 +++ got/got.1 @@ -354,15 +354,15 @@ This default behaviour can be overridden with the .Cm got fetch is invoked in a work tree then this work tree's current branch will be fetched, too, provided it is present on the server. -This default behaviour can be overridden with the -.Fl a -and -.Fl b -options. If no branches to fetch can be found in -.Xr got.conf 5 , -on the command line, or via a work tree, a branch resolved via the remote -repository's HEAD reference will be fetched. +.Xr got.conf 5 +or via a work tree, or said branches are not found on the server, a branch +resolved via the remote repository's HEAD reference will be fetched. +This default behaviour can be overridden with the +.Fl a +and +.Fl b +options. .Pp New changes will be stored in a separate pack file downloaded from the server. Optionally, separate pack files stored in the repository can be combined with -- Mark Jamsek GPG: F2FF 13DE 6A06 C471 CA80 E6E2 2930 DC66 86EE CF68