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)to
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 =
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
. =C2=A0 =C2=A0 =C2=A0 =C2=A02947 =C2=A0 =C2=A0IN =C2=A0 =C2=A0 =C2=A0CNAM=E =C2=A0 <a href=3D"http://gitmir.geo.FreeBSD.org">gitmir.geo.FreeBSD.org</= a>.<br><a href=3D"http://gitmir.geo.FreeBSD.org">gitmir.geo.FreeBSD.org</a>=
(...))
% 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 =C3=A0(s=
15:43):s.
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 <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 detail=
Thanks,
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
and it is stucked in same commit:<br><br></div>git log:<div><br>commit 5a=5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (HEAD -> main, origin/main, origi= n/HEAD)<br>Author: Carlo Strub <cs@FreeBSD.org><br>Date: =C2=A0 Sun D=
On Dec 7, 2025, at 17:04, Nuno Teixeira <eduardo@freebsd.org> wrote:stucked in same commit:
=20
(...)
=20
Also did a git clone https://git.FreeBSD.org/ports.git and it is =
=20origin/main, origin/HEAD)
git log:
=20
commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (HEAD -> main, =
Author: Carlo Strub <cs@FreeBSD.org>s) 15:45):
Date: Sun Dec 7 11:29:09 2025 +0100
=20
devel/jetbrains-phpstorm: Update to 2025.2.4
=20
PR: 290701
Reported by: maintainer
=20
commit e474eb4802ee6ecc3c530edd1473e78051965f0c
Author: Carlo Strub <cs@FreeBSD.org>
Date: Sun Dec 7 11:27:14 2025 +0100
=20
devel/jetbrains-goland: Update to 2025.2.4
=20
PR: 290700
Reported by: maintainer
=20
commit da4c13bc15b39883abc75dd2c0ea16830ce0234c
=20
Nuno Teixeira <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 =C3=A0(=
(...)gitmir.geo.FreeBSD.org.
=20
% 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
=20
;; ANSWER SECTION:
git.freebsd.org. 2947 IN CNAME =
gitmir.geo.FreeBSD.org. 76 IN A 85.30.190.139s) 15:43):
=20
;; AUTHORITY SECTION:
=20
;; ADDITIONAL SECTION:
=20
;; Query time: 2 msec
;; SERVER: 192.168.1.1
;; WHEN: Sun Dec 7 15:45:23 2025
;; MSG SIZE rcvd: 85
=20
Nuno Teixeira <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 =C3=A0(=
Hello all,to latest.
=20
I'm stucked in a old commit and git pull --rabase don't wanna update =
Could this be a server problem?origin/HEAD, tmp_main)
I already did some cleanup and stuff:
=20
% git gc --prune=3Dnow
% git index-pack -v .git/objects/pack/*.pack
=20
commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (origin/main, =
Author: Carlo Strub <cs@FreeBSD.org>do not
Date: Sun Dec 7 11:29:09 2025 +0100
=20
% git pull --rebase
Current branch main is up to date.
=20
% 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 =
hint: have locally. This is usually caused by another repository =pushing to
hint: the same ref. If you want to integrate the remote changes, usedetails.
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for =
=20
Thanks,
=20
--=20
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
=20
=20
--=20
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
=20
=20
--=20
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
(s)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 isstucked in same commit:
git log:
commit 5a5039a587d6a77b0837dfb3ffa29e635fb0d1a3 (HEAD -> main,origin/main, origin/HEAD)
Author: Carlo Strub <cs@FreeBSD.org>
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 <cs@FreeBSD.org>
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 <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 =C3=A0=
15:45):(s)
(...)
% 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 =C3=A0=
15:43):o
Hello all,
I'm stucked in a old commit and git pull --rabase don't wanna update tolatest.
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 <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 d=
notg
hint: have locally. This is usually caused by another repository pushin=
to
hint: the same ref. If you want to integrate the remote changes, usedetails.
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for
Thanks,
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> 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
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 <bofh@freebsd.org> escreveu (domingo, 7/12/2025 |a(s) 16:07):
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, origin/main, origin/HEAD)
Author: Carlo Strub <cs@FreeBSD.org>
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 <cs@FreeBSD.org>
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 <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 |a(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 <eduardo@freebsd.org> escreveu (domingo, 7/12/2025 |a(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
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
Same here.
host git.freebsd.orggit.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
--The github read-only mirror has stopped were: https://cgit.freebsd.org/ports/log/
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
| Sysop: | Amessyroom |
|---|---|
| Location: | Fayetteville, NC |
| Users: | 54 |
| Nodes: | 6 (0 / 6) |
| Uptime: | 18:03:37 |
| Calls: | 742 |
| Files: | 1,218 |
| D/L today: |
4 files (8,203K bytes) |
| Messages: | 184,416 |
| Posted today: | 1 |