From nobody Sat Jun 18 13:57:14 2022 X-Original-To: freebsd-ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 38A66867DBD for ; Sat, 18 Jun 2022 13:57:35 +0000 (UTC) (envelope-from andyf@andyit.com.au) Received: from alpine.spintel.net.au (alpine.spintel.net.au [203.23.236.77]) (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 4LQHXt05YSz3p6H for ; Sat, 18 Jun 2022 13:57:33 +0000 (UTC) (envelope-from andyf@andyit.com.au) Received: from drunkfish.andyit.com.au (unknown [202.87.175.55]) by alpine.spintel.net.au (Postfix) with ESMTPS id 393824C2A0D for ; Sat, 18 Jun 2022 23:57:22 +1000 (AEST) Received: from [172.22.2.15] (tosh2.andyit.com.au [172.22.2.15]) by drunkfish.andyit.com.au (8.16.1/8.16.1) with ESMTPS id 25IDvKJp030367 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO) for ; Sat, 18 Jun 2022 23:57:20 +1000 (AEST) (envelope-from andyf@andyit.com.au) Message-ID: <8ccf0ca5-abdf-9ed4-530d-95e1a59f5108@andyit.com.au> Date: Sat, 18 Jun 2022 23:57:14 +1000 List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Content-Language: en-US To: freebsd-ports@freebsd.org From: Andy Farkas Subject: git pull not replicating? Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4LQHXt05YSz3p6H X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of andyf@andyit.com.au has no SPF policy when checking 203.23.236.77) smtp.mailfrom=andyf@andyit.com.au X-Spamd-Result: default: False [-0.43 / 15.00]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.64)[-0.645]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.60)[-0.599]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-ports@freebsd.org]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[andyit.com.au]; NEURAL_HAM_SHORT(-0.99)[-0.985]; MLMMJ_DEST(0.00)[freebsd-ports]; 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:18390, ipnet:203.23.236.0/24, country:AU]; SUBJECT_ENDS_QUESTION(1.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[203.23.236.77:from] X-ThisMailContainsUnwantedMimeParts: N If I do a 'git pull' in /usr/ports usually it updates a few files and I think 'good, my ports tree is in sync with upstream'. And if I do it again shortly afterwards, I get: root:/usr/ports # git pull Already up to date. root:/usr/ports # Which is also good. But if I do this: root:/usr/ports # mv ftp /root/ root:/usr/ports # git pull Already up to date. root:/usr/ports # ..which is obviously false. Now my belief that I am in sync with upstream is shattered. Is there a git incantation that will make sure my tree is fully in sync with upstream? Thanks, -andyf ps. root:/usr/ports # cat .git/config [core]         repositoryformatversion = 0         filemode = true         bare = false         logallrefupdates = true [remote "origin"]         url = https://git.freebsd.org/ports.git         fetch = +refs/heads/main:refs/remotes/origin/main [branch "main"]         remote = origin         merge = refs/heads/main