From nobody Sun Dec 7 15:45:56 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 4dPTww3sjwz6Kbhr for ; Sun, 07 Dec 2025 15:46:08 +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 4dPTww11l6z3mrQ for ; Sun, 07 Dec 2025 15:46:08 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765122368; 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=gsTN/6sB2p3t0pJk4QokS95/2EledPjqhjjuVlmfI0Y=; b=G0pLAYnmhZ58E6oM8ffmDd8DiuKXKTtnjnlnr87IOCORUl+RWBYz5IzrME4U7bU9UlF5O2 iAzs4VS7pQx492CLAzM2bN/YyatBr5ScLz35oe7EWA+w6M7cI/5kJ+lauYf1nXrGqMugsN nggZ7bFD73qcaOUD6KrnSvDIGeHyZLQvfrt3etHmkwrnjrgK2dbSJIaXazsOrvT8vIv13e pU3E4MVs8qMhPBhA3bTDxtLX7kEvuk992zhUcp7J8WZB9JwIaMGbfgcfPGkag6EdzoH+r/ VPkAdhZjOZsFldSaFjyYyqZa74W/hPXLTNug7jPd7fGngHBbUsDS9owd25Sdww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765122368; 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=gsTN/6sB2p3t0pJk4QokS95/2EledPjqhjjuVlmfI0Y=; b=FvSlqOd2pOhmqI5J6vUiCG82v9v/hYEGv39qvSCym+K6URTSrSiQVBCKQKl6PvsrtPa9RQ tLy8usOAiOVxKPfhSjVooJNJaYnw0K22EP+ToNMbUBaX7xxi0C5Fd7PUM2JY8mR+QrQ3ej 9n3VnSQQtRaLmMN5bAhpIdHsDWVaS5CgVmhNr6+mwvnwZCyyIVa1wujAdyoeKKtCrhhjbH rRjDcWetjtGg8M9gZmiURCVer6qsuANoCTd6v5/a8Im+N+e+Oy50P66ggVOuOmffNSq/k4 pac8NPomrpVcABf5VxTnMgrHnXNMWqAes1+2mFjHUBgtL/aeHVvMfx+conEa9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765122368; a=rsa-sha256; cv=none; b=kAcg3XsDgYjtxRGJASGeKudaIHnyWiSFpix2OJMojGJKWmvc2Zgjk6C41GnOY846DoY3yn 6j92kevkeShfR/BxGUE3SzKqGrJWEfLryRxN1w/WaQjM2z7ck/1NFyTu2kC4Cd2PVREjxY qDlvqG9h/0DLAcfzrXxWHePwcvuWf87Hpwo7XVyXIkgYHGUU/dl0NOJLAIpaC065GKLJLm aly9SXnddNrNE9y+QJgXrd/pUW6PNJRM77jthIKwtQ2d/o8pyjoBHqnQecpCuy6WJRukFf 5ixpayyW1lf8wuYRHuJ931WA7W0iOZhqp7YKQH3IZYP2qtXQUbZ9rfHbuTs75g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (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 4dPTww01z2zLWY for ; Sun, 07 Dec 2025 15:46:07 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-4ed96ee11c2so1713271cf.2 for ; Sun, 07 Dec 2025 07:46:07 -0800 (PST) X-Gm-Message-State: AOJu0YyTyEJiNFOL6eQPVRsAHgENbKbo7vm2yFoUlRnWnTFq9FeRz2+i 1Rp3IVC+G0oao30JVBn1XJzGDUtIJNugxPGxvsNykiO5J5R0E2DZ1odfAIUhQqlz0bWzBW7wJM9 OHkrbqaF5qXONRIE9Ja14YZcMYuRNs0Q= X-Google-Smtp-Source: AGHT+IG+hoekAFEVTU2mzKqdxnMUWqpbQd+RUzeGMdEFBf1VPiAdx7mgwCsVo2UyNqkHs/Po5UP4oW0OpdcACMdST/o= X-Received: by 2002:a05:622a:50b:b0:4ed:616f:3cee with SMTP id d75a77b69052e-4f03fd9a490mr59784751cf.4.1765122367407; Sun, 07 Dec 2025 07:46:07 -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 15:45:56 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2pk-WUIcLy5EaYLnxxUktjsne8ujLZP-t7n9KcgJ9yZzGwRxi2Ya8rToNM 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="000000000000b1c9c306455e93c0" --000000000000b1c9c306455e93c0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable (...) % 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 details= . > > Thanks, > > -- > Nuno Teixeira > FreeBSD UNIX: Web: https://FreeBSD.org > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000b1c9c306455e93c0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
(...)

% 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. =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=A0CNAM= E =C2=A0 gitmir.geo.FreeBSD.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.3= 0.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=A0rcvd: 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 d= on't wanna update to latest.
Could this be a server probl= em?
I already did some cleanup and stuff:

% git gc --p= rune=3Dnow
=C2=A0% git index-pack -v .git/objects/pack/*.pack
=
commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (origin/main, origin/HE= AD, tmp_main)
Author: Carlo Strub <cs@FreeBSD.org>
Date: =C2=A0= Sun Dec 7 11:29:09 2025 +0100

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

% git push
Enter passphrase for key '/ho= me/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=A0m= ain -> main (fetch first)
error: failed to push some refs to 'git= repo.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 pu= shing again.
hint: See the 'Note about fast-forwards' in 'gi= t 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
--000000000000b1c9c306455e93c0--