From owner-freebsd-current@freebsd.org Sat Sep 26 00:19:33 2020 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 C3F793E9835 for ; Sat, 26 Sep 2020 00:19:33 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (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 4ByqCm5R7fz3Wv7; Sat, 26 Sep 2020 00:19:32 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: by sdaoden.eu (Postfix, from userid 1000) id 9BE4C16059; Sat, 26 Sep 2020 02:19:25 +0200 (CEST) Date: Sat, 26 Sep 2020 02:19:25 +0200 From: Steffen Nurpmeso To: Patrick McMunn Cc: emaste@freebsd.org, freebsd-current@freebsd.org Subject: Re: error pulling from the Beta git repo Message-ID: <20200926001925.BVBKn%steffen@sdaoden.eu> In-Reply-To: References: Mail-Followup-To: Patrick McMunn , emaste@freebsd.org, freebsd-current@freebsd.org User-Agent: s-nail v14.9.19 OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. X-Rspamd-Queue-Id: 4ByqCm5R7fz3Wv7 X-Spamd-Bar: / X-Spamd-Result: default: False [-0.80 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.97)[-0.975]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[sdaoden.eu]; NEURAL_HAM_LONG(-0.98)[-0.984]; NEURAL_SPAM_SHORT(0.46)[0.460]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_CONTAINS_FROM(1.00)[]; FREEMAIL_TO(0.00)[gmail.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE]; MAILMAN_DEST(0.00)[freebsd-current] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 26 Sep 2020 00:19:33 -0000 Patrick McMunn wrote in : |I'm using the beta git repo at , and I have been compiling source in that |directory. Today, when I ran "git pull", it errored out instead of updating |fully. I don't know if the error was a result of me building in the |directory, but it seems like a reasonable possibility. It was never an |issue with SVN, but should I build the source in a separate directory to |avoid problems with git? I don't know if git keeps a log that I can check |for the full output. If it does, I'd check if I knew the location. As it |is, I only have the partial output still present in my terminal window. $ git clean -fxd [--dry-run] $ [git reset --hard HEAD] $ [git fetch -vv] $ [git gc [--aggressive --prune=all]] $ git checkout -B local-branch-name origin/branch-name [Or git update-ref local-branch-name refs/remotes/origin/branch-name] Alternatively just use a bare repository as a database and several different checked-out working directories somewhere else. Btw. the Linux distro i use has a git driver for its ports system, it goes like that: cd "$REPOSITORY" 2> "/dev/null" if [ $? -lt 1 ]; then git checkout -q "$BRANCH" git fetch -q git diff --pretty=format: --name-status "$BRANCH" origin/"$BRANCH" | sed "s/M\t/ Edit /g; s/A\t/ Checkout /g; s/D\t/ Delete /g" | sort git clean -q -f git reset -q --hard origin/"$BRANCH" gc= else git clone -q -b "$BRANCH" "$URL" "$REPOSITORY" ls -1 $REPOSITORY | sed "s/^/ Checkout /" gc=--aggressive fi git gc --quiet $gc --prune=all That gc stuff is a local addition of mine, i hate stale stuff. Good night. --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt)