From nobody Sun Dec 7 16:27:37 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 4dPVs13Pw1z6KfZd for ; Sun, 07 Dec 2025 16:27:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4dPVs12Z3gz3wlB for ; Sun, 07 Dec 2025 16:27:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765124869; 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=ivccSL+dl3cbVaJjdM6SQBwjEG8p9bdNBqQQD78r+XA=; b=FesphK1kYp0jMnPNfpAgCmKNcjUA8JGtt4URGz9Dnqes75lMEWazqM1bP8Lw5E8zTk+utj F+NMye8/0OeSX3IS9Ct0B+fgEhOAGFXg0wvYyl9NRbcsLREF0K0Jd0SY/3mDC389Mn1Wnj LGikBT+ADiRGR+3VUuSaF3jMrSBy0X34BgKRug/hQYYhM1QhjQh1e7PEbKLTYfadU7E3gf fo4aRJ/Lkpc7/YBVc15V3dZDQzsqkZ58we0bKXmWi5IhvPsxwYpO9lkhDn7Lb2aDBawf+b 5fbPE0Yb9imLOdAcDtCx4C8GAZxs59DSHursdLwTDUwiMapfMfemwNArFeGHrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765124869; 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=ivccSL+dl3cbVaJjdM6SQBwjEG8p9bdNBqQQD78r+XA=; b=HVjvd7/HiOBZ/TZNVJMRUhc79BrwEer3A6OADJnHWikc5KSzNKfAOW3sWRor+h5d7Mgh9/ Yx2bKmI3GbHDhlF37emNf1icZ9Dstvrc88YT7KOsWy/HGgNOahFJNykqjUfvkSnG7wsQf3 OPh1PPVQWfA11ky7gJ9XgNCCeHO737NPnqKF1K2jCtBAIlhIbf8FTExoLvqiZ1jOnTexs8 6h69vrG3vLl2tnawp291psF0Rke5bPjx9pD/H4MsrxDIXqd+91gKQgn85IXU967KNm6f+y SttfVGfTSYWyo0iYIy6eoZtoP91OVqocwPVFk+2FWTA+D+ZRAIUZbMo7FEBzUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765124869; a=rsa-sha256; cv=none; b=M3oPR24Nm6t/F9ClWB1S0NWTxwVXFVr/wQJzPLopKRH5pXfv1WWCdjgdPUErbCKzMihOHi NY+qs3seD+ONX+D8rTURuT+2kIxESoF818E3TP0P4DJnSavE3B/aFdYad4qHItVdiNoulG DpCAsTQ/MU9kAhP50qxnvf4sv3kWfw8fzuU25TqovfZBlsB3fuqW1qUekCYSnn7JsmojgC ycLaH9Nzs3oq+OYO22P8PG/MSSM9u6C75kyUuZ08ckolKKX6lVs7gmg2jvSKGl/jB2AKB4 Zx69abXZ0DqdqUUtebtXDMdC4X+Zz/F+ybgEZzwRBQrhBf8xPM1JxZ9Smwd34A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dPVs11ljRzMyT for ; Sun, 07 Dec 2025 16:27:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-8b29aebdf3cso71053185a.1 for ; Sun, 07 Dec 2025 08:27:49 -0800 (PST) X-Gm-Message-State: AOJu0YxrQUxha+2cfvc9yqTZ76vTTwes76NI3yL+6T9ZTb8fkjOUtdKH HinozurgjCaIZTBZeuV+glGmwVKDcVVFfEHDCOE3366UB6NZo8DfWY9gL613eger2XV6FGQmQCZ U2Smn9QavskXJLiwLEjt6Rug5K4PGnro= X-Google-Smtp-Source: AGHT+IERbAHreRdRXvlzqsn108zMlrg0Pu5kUIEAdHQJjog4Fdfs5FzefhsZXjhYX3OEGKbJsXxdAyEXQu5VHuGa5Yg= X-Received: by 2002:a05:622a:612:b0:4ed:7f85:225c with SMTP id d75a77b69052e-4f03fef400dmr63972851cf.10.1765124868861; Sun, 07 Dec 2025 08:27:48 -0800 (PST) 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 References: In-Reply-To: From: Nuno Teixeira Date: Sun, 7 Dec 2025 16:27:37 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2ooXknFSr1xManxRaozwNRCaaIGZ0wSLC30wEbuMqH7hNRh9Q_89QCZWVE Message-ID: Subject: Re: git doesn't sync: fetch first error (git pull --rebase) To: Moin Rahman Cc: freebsd-git , FreeBSD Mailing List , FreeBSD Cluster Administrators Content-Type: multipart/alternative; boundary="000000000000caf44d06455f28ff" --000000000000caf44d06455f28ff Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Moin! Fixed by using ssh on both fetch/push (until problem is solved): % git remote -v freebsd origin git@gitrepo.freebsd.org:ports.git (fetch) origin git@gitrepo.freebsd.org:ports.git (push) Cheers, Moin Rahman escreveu (domingo, 7/12/2025 =C3=A0(s) 16:07= ): > > > > On Dec 7, 2025, at 17:04, Nuno Teixeira wrote: > > > > (...) > > > > Also did a git clone https://git.FreeBSD.org/ports.git and it is > stucked in same commit: > > > > git log: > > > > commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (HEAD -> main, > origin/main, origin/HEAD) > > Author: Carlo Strub > > Date: Sun Dec 7 11:29:09 2025 +0100 > > > > devel/jetbrains-phpstorm: Update to 2025.2.4 > > > > PR: 290701 > > Reported by: maintainer > > > > commit e474eb4802ee6ecc3c530edd1473e78051965f0c > > Author: Carlo Strub > > Date: Sun Dec 7 11:27:14 2025 +0100 > > > > devel/jetbrains-goland: Update to 2025.2.4 > > > > PR: 290700 > > Reported by: maintainer > > > > commit da4c13bc15b39883abc75dd2c0ea16830ce0234c > > > > Nuno Teixeira escreveu (domingo, 7/12/2025 =C3=A0= (s) > 15:45): > > (...) > > > > % 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 > > > > ;; ANSWER SECTION: > > git.freebsd.org. 2947 IN CNAME gitmir.geo.FreeBSD.org. > > gitmir.geo.FreeBSD.org. 76 IN A 85.30.190.139 > > > > ;; AUTHORITY SECTION: > > > > ;; ADDITIONAL SECTION: > > > > ;; Query time: 2 msec > > ;; SERVER: 192.168.1.1 > > ;; WHEN: Sun Dec 7 15:45:23 2025 > > ;; MSG SIZE rcvd: 85 > > > > Nuno Teixeira escreveu (domingo, 7/12/2025 =C3=A0= (s) > 15:43): > > Hello all, > > > > 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: > > > > % git gc --prune=3Dnow > > % git index-pack -v .git/objects/pack/*.pack > > > > commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (origin/main, > origin/HEAD, tmp_main) > > Author: Carlo Strub > > Date: Sun Dec 7 11:29:09 2025 +0100 > > > > % git pull --rebase > > Current branch main is up to date. > > > > % 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 d= o > not > > hint: have locally. This is usually caused by another repository pushin= g > 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. > > > > Thanks, > > > > -- > > Nuno Teixeira > > FreeBSD UNIX: Web: https://FreeBSD.org > > > > > > -- > > Nuno Teixeira > > FreeBSD UNIX: Web: https://FreeBSD.org > > > > > > -- > > 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 > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000caf44d06455f28ff Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Moin!

Fixed by using ssh on both f= etch/push (until problem is solved):

% git remote -v
freebsd
o= rigin =C2=A0git@gitrepo.freebsd.org:ports.git (fetch)
origin =C2=A0= git@gitrepo.freebsd.org:ports.git (push)

Cheers,

Moin Rahman <bofh@freebsd.org> escreveu (domingo, 7/12/2025 =C3=A0(s) 16:07):<= br>


> On Dec 7, 2025, at 17:04, Nuno Teixeira <eduardo@freebsd.org> wrote:
>
> (...)
>
> Also did a git clone https://git.FreeBSD.org/ports.git and= it is stucked in same commit:
>
> git log:
>
> commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (HEAD -> main, orig= in/main, origin/HEAD)
> Author: Carlo Strub <cs@FreeBSD.org>
> Date:=C2=A0 =C2=A0Sun Dec 7 11:29:09 2025 +0100
>
>=C2=A0 =C2=A0 =C2=A0devel/jetbrains-phpstorm: Update to 2025.2.4
>
>=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= 290701
>=C2=A0 =C2=A0 =C2=A0Reported by:=C2=A0 =C2=A0 maintainer
>
> commit e474eb4802ee6ecc3c530edd1473e78051965f0c
> Author: Carlo Strub <cs@FreeBSD.org>
> Date:=C2=A0 =C2=A0Sun Dec 7 11:27:14 2025 +0100
>
>=C2=A0 =C2=A0 =C2=A0devel/jetbrains-goland: Update to 2025.2.4
>
>=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= 290700
>=C2=A0 =C2=A0 =C2=A0Reported by:=C2=A0 =C2=A0 maintainer
>
> commit da4c13bc15b39883abc75dd2c0ea16830ce0234c
>
> Nuno Teixeira <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 =C3=A0(s) 15:= 45):
> (...)
>
> % 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<= br> > ;; QUESTION SECTION:
> ;; git.freebsd.org.=C2=A0 =C2=A0 =C2=A0IN=C2=A0 =C2=A0 =C2=A0 A
>
> ;; ANSWER SECTION:
> git.freebsd.org.=C2=A0 =C2=A0 =C2=A0 =C2=A0 2947=C2=A0 =C2=A0 IN=C2= =A0 =C2=A0 =C2=A0 CNAME=C2=A0 =C2=A0gitmir.geo.FreeBSD.org.
> gitmir.geo.FreeBSD.org. 76=C2=A0 =C2=A0 =C2=A0 IN=C2=A0 =C2=A0= =C2=A0 A=C2=A0 =C2=A0 =C2=A0 =C2=A085.30.190.139
>
> ;; AUTHORITY SECTION:
>
> ;; ADDITIONAL SECTION:
>
> ;; Query time: 2 msec
> ;; SERVER: 192.168.1.1
> ;; WHEN: Sun Dec=C2=A0 7 15:45:23 2025
> ;; MSG SIZE=C2=A0 rcvd: 85
>
> Nuno Teixeira <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 =C3=A0(s) 15:= 43):
> Hello all,
>
> 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:
>
> % git gc --prune=3Dnow
>=C2=A0 % git index-pack -v .git/objects/pack/*.pack
>
> commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (origin/main, origin/H= EAD, tmp_main)
> Author: Carlo Strub <cs@FreeBSD.org>
> Date:=C2=A0 =C2=A0Sun Dec 7 11:29:09 2025 +0100
>
> % git pull --rebase
> Current branch main is up to date.
>
> % git push
> Enter passphrase for key '/home/nunotex/.ssh/id_rsa':
> To gitrepo.freebsd.org:ports.git
>=C2=A0 ! [rejected]=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 main -> main (fetch first)
> error: failed to push some refs to 'gitrepo.freebsd.org:ports.git&= #39;
> hint: Updates were rejected because the remote contains work that you = do not
> hint: have locally. This is usually caused by another repository pushi= ng 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 --he= lp' for details.
>
> Thanks,
>
> --
> Nuno Teixeira
> FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0= https= ://FreeBSD.org
>
>
> --
> Nuno Teixeira
> FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0= https= ://FreeBSD.org
>
>
> --
> Nuno Teixeira
> FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0= 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



--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--000000000000caf44d06455f28ff--