From owner-freebsd-git@freebsd.org Tue Mar 2 12:24:18 2021 Return-Path: Delivered-To: freebsd-git@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 6B18A5680C9 for ; Tue, 2 Mar 2021 12:24:18 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx1.enfer-du-nord.net (mx1.enfer-du-nord.net [91.121.41.56]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DqbsY2qdDz3p9K for ; Tue, 2 Mar 2021 12:24:17 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f01:6201:5073:d735:abc8:920] (p200300fB4F0162015073D735abc80920.dip0.t-ipconnect.de [IPv6:2003:fb:4f01:6201:5073:d735:abc8:920]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.enfer-du-nord.net (Postfix) with ESMTPSA id 4DqbsP1RBwzXK8 for ; Tue, 2 Mar 2021 13:24:09 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: ports and git, first steps Message-Id: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> Date: Tue, 2 Mar 2021 13:23:56 +0100 To: freebsd-git@freebsd.org X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4DqbsY2qdDz3p9K X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 91.121.41.56) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[91.121.41.56:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[91.121.41.56:from:127.0.2.255]; ARC_NA(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_NA(0.00)[ellael.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:91.121.0.0/16, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 12:24:18 -0000 Hi, I am running STABLE-13 and use poudriere (svn+https) to compile my ports = of interest. Disclaimer: I do consider myself a newbie with regard to git. After my migration from svn to git regarding sources, I recently = installed a git repository for ports sources. It is working as expected, = good. But then I added some local ports to the ports directory, which I added = to .git/info/exclude. Ok, that worked out. Now I had had to modify the Makefile of www/wordpress like I did before = in the svn ports tree. Now git complained: mwn> git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working = directory) modified: www/wordpress/Makefile It took 3.44 seconds to enumerate untracked files. 'status -uno' may speed it up, but you have to be careful not to forget to add new files yourself (see 'git help status'). no changes added to commit (use "git add" and/or "git commit = -a") Thus I applied 'git commit': mwn> git commit -a -m "modified to compile wordpress without = llvm" [master 39b5d0652] modified to compile wordpress without llvm Committer: admin mer-waases.net Your name and email address were configured automatically based on your username and hostname. Please check that they are = accurate. You can suppress this message by setting them explicitly. Run = the following command and follow the instructions in your editor to = edit your configuration file: git config --global =E2=80=94edit After doing this, you may fix the identity used for this commit = with: git commit --amend --reset-author =09 1 file changed, 1 insertion(+), 1 deletion(-) Now, 'git status' shows: mwn> git status On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits) It took 3.17 seconds to enumerate untracked files. 'status -uno' may speed it up, but you have to be careful not to forget to add new files yourself (see 'git help status'). nothing to commit, working tree clean Well, that looks fine for a git newbie, But there are some questions = left for me: 1) Will my commited Makefile become overwritten if the master Makefile = becomes modified in the future? (I hope so) 2) Will all upcoming modifications in = 'remote.origin.url=3Dgit://github.com/freebsd/freebsd-ports.git' be = pulled, although 'Your branch is ahead of 'origin/master' by 1 commit.'? 3) Is there a better, more suited way to deal with local modifications? 4) In analogy to the recommendations for src and git, I did run 'git = config pull.ff only'. Is that wrong when it comes to ports (I do not understand what that = means, yet) Thanks and regards, Michael