Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Jun 2022 23:57:14 +1000
From:      Andy Farkas <andyf@andyit.com.au>
To:        freebsd-ports@freebsd.org
Subject:   git pull not replicating?
Message-ID:  <8ccf0ca5-abdf-9ed4-530d-95e1a59f5108@andyit.com.au>

next in thread | raw e-mail | index | archive | help

If I do a 'git pull' in /usr/ports usually it updates a few files
and I think 'good, my ports tree is in sync with upstream'. And if
I do it again shortly afterwards, I get:

root:/usr/ports # git pull
Already up to date.
root:/usr/ports #

Which is also good.

But if I do this:

root:/usr/ports # mv ftp /root/
root:/usr/ports # git pull
Already up to date.
root:/usr/ports #

..which is obviously false.

Now my belief that I am in sync with upstream is shattered.

Is there a git incantation that will make sure my tree is fully
in sync with upstream?

Thanks,

-andyf

ps.

root:/usr/ports # cat .git/config
[core]
         repositoryformatversion = 0
         filemode = true
         bare = false
         logallrefupdates = true
[remote "origin"]
         url = https://git.freebsd.org/ports.git
         fetch = +refs/heads/main:refs/remotes/origin/main
[branch "main"]
         remote = origin
         merge = refs/heads/main





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8ccf0ca5-abdf-9ed4-530d-95e1a59f5108>