Date: Sun, 7 Dec 2025 15:45:56 +0000 From: Nuno Teixeira <eduardo@freebsd.org> To: freebsd-git <freebsd-git@freebsd.org>, FreeBSD Mailing List <freebsd-ports@freebsd.org> Subject: Re: git doesn't sync: fetch first error (git pull --rebase) Message-ID: <CAFDf7UKRpxX69OtrG_dg_a32ppj_uedhkVE=jX3nGTso8Kpqng@mail.gmail.com> In-Reply-To: <CAFDf7ULF_0Jjw4JdcJVJai4irJbCTPQ-wjniraBvoYOkABydaA@mail.gmail.com> References: <CAFDf7ULF_0Jjw4JdcJVJai4irJbCTPQ-wjniraBvoYOkABydaA@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] (...) % 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 <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 à(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=now > % git index-pack -v .git/objects/pack/*.pack > > commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (origin/main, origin/HEAD, > tmp_main) > Author: Carlo Strub <cs@FreeBSD.org> > 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: <eduardo@FreeBSD.org> Web: https://FreeBSD.org > -- Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org [-- Attachment #2 --] <div dir="ltr">(...)<br><br>% drill -t a <a href="http://git.freebsd.org">git.freebsd.org</a><br>;; ->>HEADER<<- opcode: QUERY, rcode: NOERROR, id: 48634<br>;; flags: qr rd ra ; QUERY: 1, ANSWER: 2, AUTHORITY: 0, ADDITIONAL: 0<br>;; QUESTION SECTION:<br>;; <a href="http://git.freebsd.org">git.freebsd.org</a>. IN A<br><br>;; ANSWER SECTION:<br><a href="http://git.freebsd.org">git.freebsd.org</a>. 2947 IN CNAME <a href="http://gitmir.geo.FreeBSD.org">gitmir.geo.FreeBSD.org</a>.<br><a href="http://gitmir.geo.FreeBSD.org">gitmir.geo.FreeBSD.org</a>. 76 IN A 85.30.190.139<br><br>;; AUTHORITY SECTION:<br><br>;; ADDITIONAL SECTION:<br><br>;; Query time: 2 msec<br>;; SERVER: 192.168.1.1<br>;; WHEN: Sun Dec 7 15:45:23 2025<br><div>;; MSG SIZE rcvd: 85</div></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">Nuno Teixeira <<a href="mailto:eduardo@freebsd.org">eduardo@freebsd.org</a>> escreveu (domingo, 7/12/2025 à(s) 15:43):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>Hello all,<br><br></div><div>I'm stucked in a old commit and git pull --rabase don't wanna update to latest.<br></div><div>Could this be a server problem?<br></div><div>I already did some cleanup and stuff:<br><br>% git gc --prune=now</div><div> % git index-pack -v .git/objects/pack/*.pack<br><br>commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (origin/main, origin/HEAD, tmp_main)<br>Author: Carlo Strub <cs@FreeBSD.org><br>Date: Sun Dec 7 11:29:09 2025 +0100<br><br>% git pull --rebase<br>Current branch main is up to date.<br><br>% git push<br>Enter passphrase for key '/home/nunotex/.ssh/id_rsa':<br>To gitrepo.freebsd.org:ports.git<br> ! [rejected] main -> main (fetch first)<br>error: failed to push some refs to 'gitrepo.freebsd.org:ports.git'<br>hint: Updates were rejected because the remote contains work that you do not<br>hint: have locally. This is usually caused by another repository pushing to<br>hint: the same ref. If you want to integrate the remote changes, use<br>hint: 'git pull' before pushing again.<br>hint: See the 'Note about fast-forwards' in 'git push --help' for details.<br><br></div><div>Thanks,</div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888"> FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div></div>; </blockquote></div><div><br clear="all"></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888"> FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div>;help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UKRpxX69OtrG_dg_a32ppj_uedhkVE=jX3nGTso8Kpqng>