From nobody Sun Dec 7 16:07:21 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 4dPVPk2pfvz6Kct7; Sun, 07 Dec 2025 16:07:38 +0000 (UTC) (envelope-from bofh@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dPVPk29t7z3qgD; Sun, 07 Dec 2025 16:07:38 +0000 (UTC) (envelope-from bofh@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765123658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qsq7h9u7St+ZdH7sTRtxezmFKQZBXJ0hIQ3MFdqK6K8=; b=VTHh/YzeZG+zWIKCLvtR7A7nkkvo15su8DtEuE8Ft8oFIU6B06GaEKbNSujEPt+56ryU4t Gg0I3JmFVOgi1Lz8CQCvX/ZUfKFSEISuRCFbGrKX5TG+iPALTMwgRTPgfYHi8fEQ3Xf7UF A1pi0IUL7zCpUSLf4jAHI7CLgGmqblAAWrlLJrK5wiEFpiEil+pNqxoPe5FkWiokSr5u17 o/pwIlHsaQi3vsgd60vevNgaJaxmHI0GimB/4+o/q/uIhspMAON1J7Fe5+cBrIbnzZkBsn KxFVzNa2fe067gWdmvyjXOXXGIvNvlkVWOQlVQVSOG1X4CpSyx+psyA/nT16jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765123658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qsq7h9u7St+ZdH7sTRtxezmFKQZBXJ0hIQ3MFdqK6K8=; b=vaycJ8nycnPLsmKD4Yxm+QBknB4jI8P3eurBTz3/sj/uHdnd2axy6/ac7uf1x2Xm2BHwWJ 0z7Qib/2TX7r4tg/Q2aIZ3QWfi2hf5gFu2J+uuNFm1y89unQ9SCB4uJV+wJYZtQmQvAuwO 8w9khNodY1STv3J0YL6amLYDyqZQWJzqfA5ZV2of+nIc1rbEFNRAkHDz0ZHOi0En6rPynR 24r41UmKiUXFYz/NHNzHI60IVinxJnMJXwRbhSal2QoR559qoEOJT2xyw+h4nFA1jTfla0 ojtUP2e288DXvo7qiX487id7cxqB873dH2UOFgzzFqk0NFb69HSJOTQeqa+MOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765123658; a=rsa-sha256; cv=none; b=fDPIlQQUmrvA+fPlSRasNs7kwjMftVGFt3gjI+9AhC+dgJxjsqEBWrmGtJCr3qJdIXHPg2 EA5PtXtC70PpwDwJdm72KYTMomwfbxIGEgkY7zAO76101BQ5fm+oRjKL6F7RdvR+xOaxwd PDTIVtqcIfJ58jnSNSkJNfGk6xQXATczOtP8T57UnwdCbqN3QhyhMu1VFirmCXEVxzLHBm tifwsxUke862TcVI9lztZHYixk59RbE+0FrV5zVNoq2UwroDsvmxIAgcB1e2KA8SlG91vt a3aL1s5oeuiR4MkDWRWYJiFX1v0SYzQ2X3O+merZ68HOzevT3HANFCVKw68/cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx.bofh.network (mx.bofh.network [IPv6:2a01:4f8:262:4c8e::227]) (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) (Authenticated sender: bofh/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dPVPj4xWHzLpq; Sun, 07 Dec 2025 16:07:37 +0000 (UTC) (envelope-from bofh@freebsd.org) Received: from smtpclient.apple (77-168-254-60.fixed.kpn.net [77.168.254.60]) by mx.bofh.network (OpenSMTPD) with ESMTPSA id 06ab8688 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Sun, 7 Dec 2025 16:07:33 +0000 (UTC) Content-Type: multipart/signed; boundary="Apple-Mail=_C99C182A-E6B3-4707-A6CE-363504A2FE0A"; protocol="application/pgp-signature"; micalg=pgp-sha512 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 \(3776.700.51.11.4\)) Subject: Re: git doesn't sync: fetch first error (git pull --rebase) From: Moin Rahman In-Reply-To: Date: Sun, 7 Dec 2025 17:07:21 +0100 Cc: freebsd-git , FreeBSD Mailing List , FreeBSD Cluster Administrators Message-Id: References: To: Nuno Teixeira X-Mailer: Apple Mail (2.3776.700.51.11.4) --Apple-Mail=_C99C182A-E6B3-4707-A6CE-363504A2FE0A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > 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 Same here. =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 . Kind regards, Moin --Apple-Mail=_C99C182A-E6B3-4707-A6CE-363504A2FE0A Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEETfdREoUGjQZKBS+fvbm1phfAvJEFAmk1pjlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDRE Rjc1MTEyODUwNjhEMDY0QTA1MkY5RkJEQjlCNUE2MTdDMEJDOTEACgkQvbm1phfA vJELAA/+JCpeF2IFdNSalJm6tUG+meDKe0G591njcLHYooro5OSMsZpnRZzmsDEI g2AuAOgQlRKWmnzQhIwL/QLu2ZDEUgGh+iBFZmJMtBR/sOaNpYWxaonMgxVxmuMI uzMkjA2IqrvlIREEZamxZ0F9ECoayE5OY+Bgea3eCzXuZ8nzl6MmY0bprCrsJzQq KhFa5Ruy6SitfhcjzAmtJafmS0KB02UtG5xtEe6ja1IcEVh8tOJRmkmxoGr+L7Fa sw9Lzqo/+b3DUgkoOgprVdljaWPjxocRw39yX7QkRHSUvOybYcFwRuDzeYnH1Swi Eb3OOYTy/kj5ULAEiW3qQo6fc/MNL2eOSifzNMnEBThMVYi1cWwkrZUl9v2EIQJ9 1ekZ98l3c7FMMAmq9k6Y3hqSPd+d1jEkqd3B7YCbaFFNrIh107niWzo2XK7npl6h 2lVFOHv03p9apIq1BtY2MX0A05QlSGKojwZzMiNtT6Al9/VRYDA4/wRfu01gCgNe G6ON8gY3ax0svwgx9amjiWZwRy8UfIFFBmARBbe2YWcHGL6h9UGHjzcDRo3ePW8t OXehUrUBH6C9uF8vhSb+/zd1mp+NBJv53qduk0gWvFKWyPRowgZgeMbw6u+L4YQP twOVpj25p62OUMGFXNaO+iVC5/6PAOoneYs3PzY6uNvxBHd9fr0= =3QAD -----END PGP SIGNATURE----- --Apple-Mail=_C99C182A-E6B3-4707-A6CE-363504A2FE0A--