From nobody Sun Dec 7 15:43:59 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 4dPTtg2Q90z6KbML for ; Sun, 07 Dec 2025 15:44:11 +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 4dPTtg1d25z3mC6 for ; Sun, 07 Dec 2025 15:44:11 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765122251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=DqyEprMkaGdCvcB3aGbMVpvNEXh8LscZNLx5OXxNSKA=; b=OoU7vg9Snud91wRRRL8e95gxlbBSZWi1pXZmRK8c2yurFHLvrjr9EYGXm3u0fUPS357xlP B5i04t2PTaj3ZB/uPi8QVY7viCwNzVZbhiBPx8hNHevgWTTKd8b1TkCUbMEREIZVhPOFl1 WhaBXM9CNOwmAWh/b+BlMujrokm6hyACUl0jaAwLtNLTpaByDIyXFVW3o3mmGpi7ixwCAj cgIBjG4tVu7PGfWiOqVfvmthS06e6TPO+THiouiekQsl81IM6WzaONcNzDG9m7Xr6uoJMp z4IBZT012/8PhK5VLHNH9Rhxm7DwDTfSJSRKq8OkWf4/YwiR5dsU+CFx0i60jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765122251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=DqyEprMkaGdCvcB3aGbMVpvNEXh8LscZNLx5OXxNSKA=; b=eY9a27Y/2q9d675+HFmLH48ozuVV2ikePD0NPlDSg8PeUiGpVlddyNqx2zrWO/JRK7doG6 mbHxwTKZaKVFrruP7dTUgcSmBpf97KnkUIsqta/w+8oguSw8oM1AOWE3v04bPMfJHEaYes hgKXIwrZ/bToxSub7LrlSL6+wkKxmNCz3QVqcaND92zPM0VvRB7FbzLHzcgfOMYTPtsqXF NoPj39TSPQFDrSN8GUow4/mHnnOx6k6+YUou7/dTWrWHdhbNEcyfVh460x1CH2NYOLWf3u sECU6odt9YhZDi1ztft1mQ5u4cv2+7eOO3sFVHGiL7+AjCrT8H8OMWiync5D6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765122251; a=rsa-sha256; cv=none; b=dGRl4kQcHqEDKhPiM2bmEddPBOJjRjc62+LGWZJsjd0lQAPPSPJBqaFTJ3BV6bAoTndkN8 Q4bg7BUmVdU0MwvLFe+KZAAbPtuoPG9mV1bMtOk2hQZjnB69asloLrFK5tdNVpTa7UCwV0 3MAgfWOtQsAC9pnjfRw0NZ8kWwPaqBizbMichG8xxQTwo85aiui16cY8pBlG31JQqkn77V PGdfQ4ik1UqJtdZ0CJIgxMI80UQMtmSUJluWOIgppdIJMFx7DcVR7iHJAPP26ImHtm64/m l5D/9xTgQ7nRIELTv4F7uGlBcfYbX1741f1bM1z9w7P6/pgqPO5l5LCjoM+HaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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 4dPTtg0nlJzMD2 for ; Sun, 07 Dec 2025 15:44:11 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-8b2df1e0c10so67658785a.0 for ; Sun, 07 Dec 2025 07:44:11 -0800 (PST) X-Gm-Message-State: AOJu0YxQt5odpawAT5pC3GK6RIeTB+G9JpvHGy16LvqmVCydF5eh2v9k IP2oLVzLxchZlxBu8K0YT+3xE+kJUoYDwvpGaJ7/Gtr31uW9Ap1MHRls5IR3WtU6K4JeY6K3HGp MIEkCsdjfaf6Tf4PIydh/yUaTv3lfsUM= X-Google-Smtp-Source: AGHT+IGU7H4Y7L2IMBmXloHX8CXJVelI4ZgncYvBxRTn7UZj92ZguxMzuXg5b3A+PNdCF5LJVbYXp1Siwrpn/MdxxZQ= X-Received: by 2002:a05:622a:181d:b0:4ed:b7f0:c76e with SMTP id d75a77b69052e-4f03fed1abcmr62869671cf.8.1765122250526; Sun, 07 Dec 2025 07:44:10 -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 From: Nuno Teixeira Date: Sun, 7 Dec 2025 15:43:59 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AQt7F2rlc6ZGLM1gXi65cEIlkfVYpFpDf5gtcBTKHcMIYFLAXnpftTe4UsCrWr0 Message-ID: Subject: git doesn't sync: fetch first error (git pull --rebase) To: freebsd-git , FreeBSD Mailing List Content-Type: multipart/alternative; boundary="000000000000ba553e06455e8cbd" --000000000000ba553e06455e8cbd Content-Type: text/plain; charset="UTF-8" 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=now % 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 --000000000000ba553e06455e8cbd Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
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 5a5039a587d6a77b0837dfb3ffa29e635= fb0d1a3 (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 --rebase
Current branch main is up to date.

% git push
En= ter passphrase for key '/home/nunotex/.ssh/id_rsa':
To gitrepo.f= reebsd.org: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: fail= ed to push some refs to 'gitrepo.freebsd.org:ports.git'
hint: Up= dates were rejected because the remote contains work that you do not
hin= t: have locally. This is usually caused by another repository pushing tohint: the same ref. If you want to integrate the remote changes, use
hi= nt: 'git pull' before pushing again.
hint: See the 'Note abo= ut 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
--000000000000ba553e06455e8cbd--