From nobody Sun Dec 7 16:48:52 2025 X-Original-To: freebsd-git@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 4dPWKk0gYnz6Kh7Y for ; Sun, 07 Dec 2025 16:49:14 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-20.consmr.mail.gq1.yahoo.com (sonic317-20.consmr.mail.gq1.yahoo.com [98.137.66.146]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 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 4dPWKj5ShMz40x4 for ; Sun, 07 Dec 2025 16:49:13 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1765126146; bh=ybe+ZKnVVjtHjeP88sqPIBwKuuJsUNbWYWp4uHapT0c=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=NSgWzGeYN6dn4b2E8YnhIBrvbTCUcx4wo3DBDxVN/KoOZogBTJgN98K5u837LGGjoU2RV62tAI/X6jWQsZ0HeJ/lML4sCGjRs3Ab4WpL6TSTKwZdC6dwNKcqRz4utvxZVigQPEnrAaagDzoHa7To/RhOCfUm1S6QktCU0Gcts23E7VcNnPfPcygv5VXSiexH6s2lwEWe9cWZb32LBUTt4fSg4eVX4hjtwHy53XE7v5vFHeeQ9j398MDYc7PdOIhd5oXghc5/j+Ea9b5sIas2kXFI4i2u95FrOE521gzQtJ4qbnPe29lUer+z3IlROIXih6wsJuOD0cndjUQl5LUqYQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1765126146; bh=iHfwqOOTXQYC0qUq0K/WK4UlKvmFOP05t7zfxND+WwA=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=KijT9WqZs//b9ZIP75cSsn14j0Wns4hNStscBlig6i4/3obDQ+m4U6hNjJoQPgOXAvQJQuCJQXjUf6frpybxWysPu4As7HyZt0SCyLeRNxywGvwaGNoVLBaYUTgI3LUFYk49olENyymVvn1QAcP53d0TN0G9EaOCe6ZL20+WwXb/rJzwDwyjJ9aRrSDKDh8xdhJbxF6/yRNew7CxSG3bYu7Km98oyvY88W0lzFPan1UnGCYBfzrNYpiTZmRUDj3ZlGNPATZnbrjfLFU6DDNNgAH0iFUPH4BEiNmsB10Y6S7qCz86zzpFzHzPpcrk9OFwqO+qxuskQYk8LYxcZ6XwCw== X-YMail-OSG: Dz7HhIEVM1miyorEFczFHl0HfJjXPfyc3u1yMYaFeNYT9iY6qdbrFpARoyACSww eTCPay3XMyKppnjObvJRsFZiMf0fzz7zLdF5xqeN0eMkkBSF5LSyMpOl1bbVYfqhPeZJcOpqcoOR LjSw6aCQDmPa2Ej9waPoZ7S.2XYM8ZEXQVruRasSe.hfOFTGfM.BXRmdK1yUGR9IyKRDKmFVFF9K nNHaXHy9P..qZf.wr7s72DE5SIGqhu5G2Ln5k0FvLmtyPZHONkbxTzxd2WWbRzFg7.29tjlmjXxO 5lTorJos3xgmkNsTJVvcSvNxPa4_uUvCSvAH1FEfL1HHdyZ70f3xFSA2ufuTZ0sI3EHyTbuDP1bz TCK3_OV1xSMsFBYYZe9X7NP4iviqFQwqKuWvdOHrhNbFagMXoxu_OArthkG044dWxai_4QvkgeF2 sTEak2.aLfAsJjmHOJ3vUzheHt1TWgboyGyOo6nvH4DywwRECvVHI61QBBXdB.eEgc83Wm.dANHL 7.uwnMGg5fFKzBkdygoHHI2it5Z4SclgWsDJ5wxYFAK.JLcyS6jYiQ_GcOEkwiB5HuvL9_8nlBYH NwLgOPN3yW8641M9q14tQgFPwZvh.lyfr.BhMTYbLsckiErtR4TeSWJ2XpkAMIy2KL5inj6oQ0_P 16aGRlYQx54BWiSVl24E78IYvoJTuB3aKRe39VrH3XBYSqfkNcX7tul2y.S7MS2GCW1Uh3ciI0xE V2J4bGGPR69VO6Mg4avjPDZUp75fNBdqXjtzRupwSBgqDIb9WVWeSLpDFmdQoUoHE_DuH2rhYKJG BoVK5L.KN2zQNOFsSHTjyaUPqwdRJfaJiur6wK_Nio3t8LjTPtdOajZQZGTsZlOtl44KA5hjt1j_ EmV9peKfkplfIGW4a55w_bdgAX_04zD0dTVBOaQ3033t60OQUsRox_ZjDzZ8ePoAIuPYcG35RBOJ jtvYFrTJzLEFNjYa3Y1iJzJsaqoepMzPOKv.j4ZhszifCE5bWHZwaL28.dFA2KdFqYRyPjqp2wYS oVvnhBVeZPvf.kPzwQtR818grIKLOirIVHplRuIzpicRVeKDaXFFylJ6AhRj0ymXqkj6xE.V3vx2 U7ga0zKTannOlkpeoBZIm8Yz46YuINYXemwzogt2zTIE.m8fYcmLfwTJ_5VVeogo9LWqcpnUJrUW yfujxwgJEVxTNuZLeO6BwDV42t7YnBVFG7CaDGCJAYjVYyNUdu1_wi.0EIA2J3YCDNiAvPAa8E3h c9wxXw1iqIsJv1vJUL32cNJKdxrAFGg6iJIMVHEItrij1wiJbWzH89iIFxv7QBk255P2kBRq_Anj JNfTXaCt0wpl.KWhFPav1tsH6hN8Shk7TEMf16oE8GNeHY1xSEAek5c8mxVFBpYlheK1TReevUei Dtu2_ifyjaVW_iB13WJiV6NYZQs008hYmO3UVQh.eKZQCrPJseFHnpEPFVw6Z1udkbqDoY2p479F Bp8AkqwlagfQsVPHIqMNsYhY4ZU2jMIB0s6SlHWdbnoQEQqzCD9xXtOwLRGFvaSE01SC0fHu.mIf mConeDsAmHhXcQvLrMwjvbEOdFoH5hahN_0SVkWzOUoypolS9tBe6PUQn.10vO5ZZWmcq4MoGzDZ 2UGJHt9XQiDITaMAbqekQDQGE_l1e7rz4GeJpVBgSlgZLSdfyLyMSEku5B8u7LMTdtHnFZYM80eg JWF7thf2rJ.5WObKSoC0_QSSNmUb6tnObDopDciTvzawNTYjtbRT78eOUyol44jaSPY2qwAOhPYg 0EvygOGD_uFuNm2v6A.hqEpk6k0iCygLMIx0Hiydfwwxd8jybe3Ia86PDrYD7EMQjAw0dLiGbllP BWwbMTz3988eShURG6_I32SYYQIGGgfj90MagTyFhUQPsIsWEgpe8q017pqGjQcuyrRbdWSEOtWq 85IxwJLE0amGoxv0TlrDiIz1hqzstVrdHZwKpJH.XL4JCeoAlm2SutXNvSf_101igEJeLbdtt9Qp B9EFzpPD.SlFZn7udXiZ90ursMFB0cdmgbJ.ZFbrNpJHpkcChohmH6iffXmjkMeYeWrbuOSbuWQt 6Q4D3bA2hehv7zUcnCI6hvkOMLVDLTnihMEJQBma9jASGiGeng5qG.Rm3KHHGsXM..eOnTIzqcc. zmVHK8ofnaqvL_aChTC_TRnNTj5BB5z7NqIhhy1IvAQ_oeEE8X5Z2b8VS.Vbap7AhJf8IaeWX9Er Kq6xGhGY_uWO6fqssOripQHQaCCqDS7itwshWVEm9O89vJAbg5GOubNzwoEcgHLVdXqL3LrND5Zm wGh0RpDgvafsXHV6bO5KmeQHbEA-- X-Sonic-MF: X-Sonic-ID: 1e47d2b2-a9a3-4dad-9768-cea341ec96e8 Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Sun, 7 Dec 2025 16:49:06 +0000 Received: by hermes--production-gq1-54bf57fc64-lg4js (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID d7147eb27282fcfe483567ab98d9aa7a; Sun, 07 Dec 2025 16:49:03 +0000 (UTC) Content-Type: text/plain; charset=utf-8 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git doesn't sync: fetch first error (git pull --rebase) From: Mark Millard In-Reply-To: Date: Sun, 7 Dec 2025 08:48:52 -0800 Cc: Moin Rahman , freebsd-git , FreeBSD Mailing List Content-Transfer-Encoding: quoted-printable Message-Id: <83D3CAB6-AFDC-49F6-86B9-C906E2C54552@yahoo.com> References: To: Nuno Teixeira X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dPWKj5ShMz40x4 On Dec 7, 2025, at 08:27, Nuno Teixeira wrote: > Hello Moin! >=20 > Fixed by using ssh on both fetch/push (until problem is solved): >=20 > % git remote -v > freebsd > origin git@gitrepo.freebsd.org:ports.git (fetch) > origin git@gitrepo.freebsd.org:ports.git (push) >=20 > Cheers, >=20 > Moin Rahman escreveu (domingo, 7/12/2025 =C3=A0(s) = 16:07): >=20 >=20 > > On Dec 7, 2025, at 17:04, Nuno Teixeira wrote: > >=20 > > (...) > >=20 > > Also did a git clone https://git.FreeBSD.org/ports.git and it is = stucked in same commit: > >=20 > > git log: > >=20 > > commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (HEAD -> main, = origin/main, origin/HEAD) > > Author: Carlo Strub > > Date: Sun Dec 7 11:29:09 2025 +0100 > >=20 > > devel/jetbrains-phpstorm: Update to 2025.2.4 > >=20 > > PR: 290701 > > Reported by: maintainer > >=20 > > commit e474eb4802ee6ecc3c530edd1473e78051965f0c > > Author: Carlo Strub > > Date: Sun Dec 7 11:27:14 2025 +0100 > >=20 > > devel/jetbrains-goland: Update to 2025.2.4 > >=20 > > PR: 290700 > > Reported by: maintainer > >=20 > > commit da4c13bc15b39883abc75dd2c0ea16830ce0234c > >=20 > > Nuno Teixeira escreveu (domingo, 7/12/2025 = =C3=A0(s) 15:45): > > (...) > >=20 > > % drill -t a git.freebsd.org > > ;; ->>HEADER<<- opcode: QUERY, rcode: NOERROR, id: 48634 > > ;; flags: qr rd ra ; QUERY: 1, ANSWER: 2, AUTHORITY: 0, ADDITIONAL: = 0 > > ;; QUESTION SECTION: > > ;; git.freebsd.org. IN A > >=20 > > ;; ANSWER SECTION: > > git.freebsd.org. 2947 IN CNAME = gitmir.geo.FreeBSD.org. > > gitmir.geo.FreeBSD.org. 76 IN A 85.30.190.139 > >=20 > > ;; AUTHORITY SECTION: > >=20 > > ;; ADDITIONAL SECTION: > >=20 > > ;; Query time: 2 msec > > ;; SERVER: 192.168.1.1 > > ;; WHEN: Sun Dec 7 15:45:23 2025 > > ;; MSG SIZE rcvd: 85 > >=20 > > Nuno Teixeira escreveu (domingo, 7/12/2025 = =C3=A0(s) 15:43): > > Hello all, > >=20 > > I'm stucked in a old commit and git pull --rabase don't wanna update = to latest. > > Could this be a server problem? > > I already did some cleanup and stuff: > >=20 > > % git gc --prune=3Dnow > > % git index-pack -v .git/objects/pack/*.pack > >=20 > > commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (origin/main, = origin/HEAD, tmp_main) > > Author: Carlo Strub > > Date: Sun Dec 7 11:29:09 2025 +0100 > >=20 > > % git pull --rebase > > Current branch main is up to date. > >=20 > > % git push > > Enter passphrase for key '/home/nunotex/.ssh/id_rsa': > > To gitrepo.freebsd.org:ports.git > > ! [rejected] main -> main (fetch first) > > error: failed to push some refs to 'gitrepo.freebsd.org:ports.git' > > hint: Updates were rejected because the remote contains work that = you do not > > hint: have locally. This is usually caused by another repository = pushing to > > hint: the same ref. If you want to integrate the remote changes, use > > hint: 'git pull' before pushing again. > > hint: See the 'Note about fast-forwards' in 'git push --help' for = details. > >=20 > > Thanks, > >=20 > > --=20 > > Nuno Teixeira > > FreeBSD UNIX: Web: https://FreeBSD.org > >=20 > >=20 > > --=20 > > Nuno Teixeira > > FreeBSD UNIX: Web: https://FreeBSD.org > >=20 > >=20 > > --=20 > > Nuno Teixeira > > FreeBSD UNIX: Web: https://FreeBSD.org >=20 > Same here. >=20 > =E2=9D=AF host git.freebsd.org > git.freebsd.org is an alias for gitmir.geo.freebsd.org. > gitmir.geo.freebsd.org has address 85.30.190.139 > gitmir.geo.freebsd.org has IPv6 address 2a02:80:0:3ffd::24ca:1 > gitmir.geo.freebsd.org mail is handled by 0 . >=20 > Kind regards, > Moin >=20 >=20 >=20 > --=20 > Nuno Teixeira > FreeBSD UNIX: Web: https://FreeBSD.org The github read-only mirror has stopped were: https://cgit.freebsd.org/ports/log/ has stopped. https://cgit.freebsd.org/src/log/?h=3Dmain is not showing a commit that: = https://lists.freebsd.org/archives/dev-commits-src-main/2025-December/date= .html shows was hours ago as well. Again, github matches the out of date https://cgit.freebsd.org/src/log/?h=3Dmain . =3D=3D=3D Mark Millard marklmi at yahoo.com