From owner-freebsd-questions@freebsd.org Sat Dec 26 11:33:03 2020 Return-Path: Delivered-To: freebsd-questions@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 F12A44B6444 for ; Sat, 26 Dec 2020 11:33:03 +0000 (UTC) (envelope-from 4250.82.1d4c70001a26574.36fd96ba15e1786e43626b2227935ae1@email-od.com) Received: from s1-b0c6.socketlabs.email-od.com (s1-b0c6.socketlabs.email-od.com [142.0.176.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D31rt6BSLz3QyX for ; Sat, 26 Dec 2020 11:33:02 +0000 (UTC) (envelope-from 4250.82.1d4c70001a26574.36fd96ba15e1786e43626b2227935ae1@email-od.com) DKIM-Signature: v=1; a=rsa-sha256; d=email-od.com;i=@email-od.com;s=dkim; c=relaxed/relaxed; q=dns/txt; t=1608982383; x=1611574383; h=content-transfer-encoding:content-type:mime-version:references:in-reply-to:message-id:subject:cc:to:from:date:x-thread-info; bh=JDPey+EJIg540bOpZueOgO8Cm+IRnVIe28KXVF01iMU=; b=DVRQjISp6ix8VO44esATgx11qinRPieSC4lOjEulJqnxOlOgZXjACO4f07+4SOh8KsMKrySbCC/0Lt/h/T8pgsVnR8M5ojrUtSffXPaIHTNqM1Hr1gqtSc/U9FUDA6RFP+t2sK1+cHQp7+lb+ns4XSeUSDvO4MRTJyEUn+h1biY= X-Thread-Info: NDI1MC45Mi4xZDRjNzAwMDFhMjY1NzQuZnJlZWJzZC1xdWVzdGlvbnM9ZnJlZWJzZC5vcmc= Received: from r3.us-east-2.aws.in.socketlabs.com (r3.us-east-2.aws.in.socketlabs.com [142.0.189.3]) by mxsg2.email-od.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Sat, 26 Dec 2020 06:33:01 -0500 Received: from smtp.lan.sohara.org (EMTPY [185.202.17.215]) by r3.us-east-2.aws.in.socketlabs.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Sat, 26 Dec 2020 06:33:00 -0500 Received: from [192.168.63.1] (helo=steve.lan.sohara.org) by smtp.lan.sohara.org with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kt7oh-000Kkj-Dm; Sat, 26 Dec 2020 11:32:59 +0000 Date: Sat, 26 Dec 2020 11:32:59 +0000 From: Steve O'Hara-Smith To: freebsd-questions@freebsd.org Cc: Matthias Apitz Subject: Re: Where can I find the new git repository? Message-Id: <20201226113259.84b4389effd0ee1f05433e62@sohara.org> In-Reply-To: References: <5fe5917a.1c69fb81.b9a27.9006SMTPIN_ADDED_MISSING@mx.google.com> <8b1fbcaa-2e09-d2e4-03eb-1bbffcada788@yuripv.dev> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd12.1) X-Clacks-Overhead: "GNU Terry Pratchett" Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D31rt6BSLz3QyX X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=email-od.com header.s=dkim header.b=DVRQjISp; dmarc=none; spf=pass (mx1.freebsd.org: domain of 4250.82.1d4c70001a26574.36fd96ba15e1786e43626b2227935ae1@email-od.com designates 142.0.176.198 as permitted sender) smtp.mailfrom=4250.82.1d4c70001a26574.36fd96ba15e1786e43626b2227935ae1@email-od.com X-Spamd-Result: default: False [-1.68 / 15.00]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:142.0.176.0/20]; RWL_MAILSPIKE_GOOD(0.00)[142.0.176.198:from]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[email-od.com:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-0.98)[-0.979]; FORGED_SENDER(0.30)[steve@sohara.org,4250.82.1d4c70001a26574.36fd96ba15e1786e43626b2227935ae1@email-od.com]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[142.0.176.198:from]; SUBJECT_ENDS_QUESTION(1.00)[]; FROM_NEQ_ENVFROM(0.00)[steve@sohara.org,4250.82.1d4c70001a26574.36fd96ba15e1786e43626b2227935ae1@email-od.com]; ASN(0.00)[asn:7381, ipnet:142.0.176.0/22, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[email-od.com:s=dkim]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[sohara.org]; SPAMHAUS_ZRD(0.00)[142.0.176.198:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[142.0.176.198:from]; MAILMAN_DEST(0.00)[freebsd-questions] X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 11:33:04 -0000 On Sat, 26 Dec 2020 12:00:57 +0100 Matthias Apitz wrote: > $ cd freebsd-src > $ git diff > > It does not show any diffs against the upstream head. I think, it does > not go even to Internet with this command. If I locally modify a file, > the diff is shown. Yep that is how git works it is a distributed version control system so diff is between your checked out copy and the branch in your repository. The basic interactions with remote repositories are just fetch and push. To collect changes from upstream use git fetch to fetch them and integrate them into your local branch use git pull (which combines a fetch and merge into your local repository). After a fetch you can compare what has been fetched with your local branch (git diff origin: or git diff FETCH_HEAD) before merging the changes in if you wish. I prefer to keep my copies of upstream branches pristine and create branches off them to do my work in. That way when I pull it's always just a fast forward and I get to deal with any conflicts in the working branch(es) when I rebase them. Also it makes it easy to separate multiple streams of work. Branching in git is extremely cheap and so just as ZFS encourages free use of filesystem boundaries git encourages free use of branching. -- Steve O'Hara-Smith