From owner-freebsd-current@freebsd.org Tue Mar 2 16:50:36 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7865056FB6E for ; Tue, 2 Mar 2021 16:50:36 +0000 (UTC) (envelope-from warlock@phouka1.phouka.net) Received: from phouka1.phouka.net (phouka1.phouka.net [107.170.196.116]) (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 (2048 bits) client-digest SHA256) (Client CN "phouka.net", Issuer "Go Daddy Secure Certificate Authority - G2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dqjmq1Fypz4j9r for ; Tue, 2 Mar 2021 16:50:34 +0000 (UTC) (envelope-from warlock@phouka1.phouka.net) Received: from phouka1.phouka.net (localhost [127.0.0.1]) by phouka1.phouka.net (8.16.1/8.16.1) with ESMTPS id 122GnC8Q053712 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 2 Mar 2021 08:49:12 -0800 (PST) (envelope-from warlock@phouka1.phouka.net) Received: (from warlock@localhost) by phouka1.phouka.net (8.16.1/8.16.1/Submit) id 122GnC8b053710; Tue, 2 Mar 2021 08:49:12 -0800 (PST) (envelope-from warlock) Date: Tue, 2 Mar 2021 08:49:12 -0800 From: John Kennedy To: bob prohaska Cc: freebsd-current@freebsd.org Subject: Re: URL for stable/13 Message-ID: References: <20210302161823.GA56341@www.zefox.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210302161823.GA56341@www.zefox.net> X-Rspamd-Queue-Id: 4Dqjmq1Fypz4j9r X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of warlock@phouka1.phouka.net has no SPF policy when checking 107.170.196.116) smtp.mailfrom=warlock@phouka1.phouka.net X-Spamd-Result: default: False [-1.77 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current]; NEURAL_HAM_MEDIUM(-0.99)[-0.989]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[phouka.net]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.170.196.116:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[107.170.196.116:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.985]; RCPT_COUNT_TWO(0.00)[2]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[warlock@phouka.net,warlock@phouka1.phouka.net]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[warlock@phouka.net,warlock@phouka1.phouka.net]; ASN(0.00)[asn:14061, ipnet:107.170.192.0/18, country:US] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 16:50:36 -0000 On Tue, Mar 02, 2021 at 08:18:23AM -0800, bob prohaska wrote: > A while back I obtained a buildable source tree for stable/13 > but it hasn't been updated in the last few days. Running > git remote show origin > reports in part > ..... > Local branch configured for 'git pull': > stable/13 merges with remote stable/13 > Local ref configured for 'git push': > stable/13 pushes to stable/13 (local out of date) > > Thanks for reading, any hints how to get back in sync apprecidated. > This is used for self-hosting on a Raspberry Pi, if it matters. You didn't say how you were refreshing. My stable/13 is a little out of date but just because it hasn't been on. My upstream repo name is "freebsd" vs "origin", but that's just a label: # git branch main * stable/13 So I think this repo was established after the SVN -> GIT cutover, when 13 was current (this "main") and then switched over to stable/13 during the 13.0 release cycle but not cut over to releng/13.0. So my "main" branch is stale below because I haven't been tracking it and my stable/13 branch was out of date because the VM had been off (not sure how it knew it was out of date, but beside the point). # git remote show freebsd | tail -6 Local branches configured for 'git pull': main merges with remote main stable/13 merges with remote stable/13 Local refs configured for 'git push': main pushes to main (local out of date) --> stable/13 pushes to stable/13 (local out of date) If you just do "git fetch", it'll probably know it is out of date but assume it is intentional. It's updating your repo, but not the source you're building from. You probably want to do a "git pull": # git pull Updating d4a0c102a237..2c19b99c2f1c Fast-forward ...lots of changes to individual files... # git remote show freebsd | tail -6 Local branches configured for 'git pull': main merges with remote main stable/13 merges with remote stable/13 Local refs configured for 'git push': main pushes to main (local out of date) --> stable/13 pushes to stable/13 (up to date) Does that answer your question?