Re: git doesn't sync: fetch first error (git pull --rebase)

Moin Rahman <[email protected]> Sun, 7 Dec 2025 17:07:21 +0100
Newsgroups	gmane.os.freebsd.devel.ports
Message-ID	<[email protected]>

> On Dec 7, 2025, at 17:04, Nuno Teixeira <[email protected]> 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 <[email protected]>
> 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 <[email protected]>
> 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 <[email protected]> escreveu (domingo, 7/12/2025 à(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 <[email protected]> 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 <[email protected]>
> 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:  <[email protected]>   Web:  https://FreeBSD.org
> 
> 
> -- 
> Nuno Teixeira
> FreeBSD UNIX:  <[email protected]>   Web:  https://FreeBSD.org
> 
> 
> -- 
> Nuno Teixeira
> FreeBSD UNIX:  <[email protected]>   Web:  https://FreeBSD.org

Same here.

❯ 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
signature.asc (application/pgp-signature, 963 B)