From nobody Sun Dec 7 16:04:05 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 4dPVKt5Jspz6KcPZ for ; Sun, 07 Dec 2025 16:04:18 +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 4dPVKt4b8Dz3pj5 for ; Sun, 07 Dec 2025 16:04:18 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765123458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oOhYvxhLmgNmfiO6/g7Onyl2cjVttKbEc2z6JoK5g3k=; b=LuT0UeR5pBe5KDdJrukR96sb9uYF58H5OmtYELV9kEU878NTeU/zJ/Q87nF1L3Z4PqwU23 6fjIWJdF5zn96BXJ+lzcYHp/p++0jEHKt8TC2iCnjr4VCERmiBPr1Y60IIU7mZDrTShHoL O0oaoC48SufmRepLWzXzK/ebU1u+r51jvvXl8WXhancSwvUzxoxH0acXj0bmTdfkP3KgG+ hcbNlzPqENH6jX+Vyk/X0ZMbipFUyE+R64ydWhBqdQ0Vjfc9tXTAEkWbDI+nbmyJmJx6xr nzkwApECk58VT5SS0IL8JmlO1pyynkLjZ9eNmx2mn+eaHKA1qj7KVjFepCXltA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765123458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oOhYvxhLmgNmfiO6/g7Onyl2cjVttKbEc2z6JoK5g3k=; b=eg+uc25sCKURg6LjlcWtImgeOtAAh4jvb+GiATC29JiaScjrmURMqAbe6Xruvsaw9/jG3v Hwno/k8LwlDHyxQoY18mhApFbt9NF3p740BrMbnkARdFJz/S6/FA2VddVFkSoD3lQlEIjg GcMQJuRyvIyw5Kgxq7P1iLoq0DYMePl3JxVGNlwRnbkCyeAgIG0tPbovf7UZaVTzcMjtYs SIglocFnWEq5SxMdF97RYK906/MOfyK3gPrelD0NwysmTLxsLe2/R/N5PLAUkhxoQvpPTt BbEaZLGQXqImbIAiRmCZpJzJHo4AFoqrDtgRtMbZIJVwyDpnKdu+XICodMpaNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765123458; a=rsa-sha256; cv=none; b=tSHCYHvXR4LEdGG3cCzsCsoyemhXioilkYzZWlSL1MqUvRg1kmM+6+DqT0yxboqOzucS4d S20BOVxkzlf7LPY3r0RVf8PWPtZWowfOy9xB7i/GswKZdFdlg4kWpCZYC3N2qPzxZ4+4O9 FM2QAEVnGHuLoxZrJdGT1orBll0FlJrYT/zJnu+POrWKe3tPerHZCsBkuyb7yI862qtzfA +Kyx+6xUSwHTqK9zzuXuKybufFR/9FgbqlscjdwDyUX3eMlxol66441uwsRSDIxsum2Urf K6Z2JW/ih/5PlHQCx9uHRGZ5K0fpQ+1lqjP4j0dhnwIruZliXKFMuX31Il2W/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (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 4dPVKt48CFzMSK for ; Sun, 07 Dec 2025 16:04:18 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-8b530003d70so85570585a.2 for ; Sun, 07 Dec 2025 08:04:18 -0800 (PST) X-Gm-Message-State: AOJu0YwJ+lB06KbuH2jM6Yqfn9j2DpPLFL8fvUQNWoVle4EAWcA6FT7T B1GkvVTTb8aQkO6FOoKPfptbPotnWIYx6/KXzSV8MzlmhMho4IrJ/eWrOtYblR9YVcjnLz7RKCs /N5nEzMb41t3wm2nPve+s9ie6oze6Fis= X-Google-Smtp-Source: AGHT+IG7U907Y1TL0hASYCf9vEFgMse5bGrZd1K0tOUqWACG3SRiCvMR9VqN+G3zzvuWdYa8ZRYxySEPXuuzzF6IkU0= X-Received: by 2002:ac8:5a0a:0:b0:4ee:2bff:2d5b with SMTP id d75a77b69052e-4f03fdea32bmr69899981cf.5.1765123457192; Sun, 07 Dec 2025 08:04:17 -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:04:05 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2qZRFqk8CMmztDSiREinkIYabjActPz9b_SANJZ7gWLKEtMV6aV09yUymQ Message-ID: Subject: Re: git doesn't sync: fetch first error (git pull --rebase) To: freebsd-git , FreeBSD Mailing List Content-Type: multipart/alternative; boundary="000000000000a6984206455ed475" --000000000000a6984206455ed475 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable (...) 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 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 detail= s. >> >> Thanks, >> >> -- >> Nuno Teixeira >> FreeBSD UNIX: Web: https://FreeBSD.org >> > > > -- > Nuno Teixeira > FreeBSD UNIX: Web: https://FreeBSD.org > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000a6984206455ed475 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
git log:

commit 5a= 5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (HEAD -> main, origin/main, origi= n/HEAD)
Author: Carlo Strub <cs@FreeBSD.org>
Date: =C2=A0 Sun D= ec 7 11:29:09 2025 +0100

=C2=A0 =C2=A0 devel/jetbrains-phpstorm: Upd= ate to 2025.2.4

=C2=A0 =C2=A0 PR: =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 290701
=C2=A0 =C2=A0 Reported by: =C2=A0 =C2=A0maintainer
commit e474eb4802ee6ecc3c530edd1473e78051965f0c
Author: Carlo Strub <= ;cs@FreeBSD.org>
Date: =C2=A0 Sun Dec 7 11:27:14 2025 +0100

= =C2=A0 =C2=A0 devel/jetbrains-goland: Update to 2025.2.4

=C2=A0 =C2= =A0 PR: =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 290700
=C2=A0 =C2=A0 R= eported by: =C2=A0 =C2=A0maintainer

commit da4c13bc15b39883abc75dd2c= 0ea16830ce0234c

Nuno Teixeira <eduardo@freebsd.org> escreveu (domingo, 7/1= 2/2025 =C3=A0(s) 15:45):
(...)

% drill -t a git.freebsd.org
;; ->>HEADER&l= t;<- opcode: QUERY, rcode: NOERROR, id: 48634
;; flags: qr rd ra ; QU= ERY: 1, ANSWER: 2, AUTHORITY: 0, ADDITIONAL: 0
;; QUESTION SECTION:
;= ; git.freebsd.org.= =C2=A0 =C2=A0 IN =C2=A0 =C2=A0 =C2=A0A

;; ANSWER SECTION:
git.freebsd.org. =C2=A0 = =C2=A0 =C2=A0 =C2=A02947 =C2=A0 =C2=A0IN =C2=A0 =C2=A0 =C2=A0CNAME =C2=A0 <= a href=3D"http://gitmir.geo.FreeBSD.org" target=3D"_blank">gitmir.geo.FreeB= SD.org.
= gitmir.geo.FreeBSD.org. 76 =C2=A0 =C2=A0 =C2=A0IN =C2=A0 =C2=A0 =C2=A0A= =C2=A0 =C2=A0 =C2=A0 85.30.190.139

;; AUTHORITY SECTION:

;; = ADDITIONAL SECTION:

;; Query time: 2 msec
;; SERVER: 192.168.1.1<= br>;; WHEN: Sun Dec =C2=A07 15:45:23 2025
;; MSG SIZE =C2=A0rcvd: 8= 5

Nuno Teixeira <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 =C3=A0(s) 1= 5: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 stu= ff:

% git gc --prune=3Dnow
=C2=A0% git index-pack -v .git/= objects/pack/*.pack

commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 = (origin/main, origin/HEAD, tmp_main)
Author: Carlo Strub <cs@FreeBSD.= org>
Date: =C2=A0 Sun Dec 7 11:29:09 2025 +0100

% git pull --r= ebase
Current branch main is up to date.

% git push
Enter pass= phrase for key '/home/nunotex/.ssh/id_rsa':
To gitrepo.freebsd.o= rg:ports.git
=C2=A0! [rejected] =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0main -> main (fetch first)
error: failed to p= ush some refs to 'gitrepo.freebsd.org:ports.git'
hint: Updates w= ere 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: = 9;git pull' before pushing again.
hint: See the 'Note about fast= -forwards' in 'git push --help' for details.

= Thanks,

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


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


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