| View previous topic :: View next topic |
| Author |
Message |
kgroombr
n00b
Joined: 23 Jul 2007
Posts: 26
|
 Posted: Sat Mar 18, 2017 2:55 am Post subject: portage git pull: up to date (not recognizing changes) |
 |
|
I recently switch over my portage from rsync to git and set up a local git server for the several systems within my network that also run gentoo so that I only sync once for all the systems I manage.
I am somewhat a novice with git and I understand that it is sensitive to how it is worked with and am getting familiar to ensuring it is sane.
My question in this case, is in the last two days I have attempted to perform a portage git pull and I am informed that it is "up to date." I know there have been changes to portage, but is this discussion related to why I am not seeing any changes, and if so, what do I need to do to recognize portage changes?
Thanks,
Ken |
|
| Back to top |
|
 |
pjp
Administrator
Joined: 16 Apr 2002
Posts: 20610
|
| Posted: Tue Mar 28, 2017 3:28 am Post subject: |
|
|
Split from With git headers removed from portage, how to track changes? as it is unclear at this point if this is related. Keeping it separate may help with an answer (which may also help others get an answer).
Added link in original post to "this discussion" for clarity.
_________________
Quis separabit? Quo animo? |
|
| Back to top |
|
|
ct85711
Veteran
Joined: 27 Sep 2005
Posts: 1791
|
| Posted: Tue Mar 28, 2017 4:19 am Post subject: |
|
|
| Quote: | | I have attempted to perform a portage git pull and I am informed that it is "up to date." |
Just curious, how did you configure portage to use git, as I am thinking it may be a thing with your configuration and partially your understanding of git. For the most part, besides configuring portage to use git in the repos.conf and doing the initial git clone to download the initial git tree of portage (which also sets up the necessary control directories too for the git repo). You shouldn't be needing to do anything special to sync portage beyond the basic emerge --sync (or which ever method you use, like you do when it used rsync). Portage knows enough when you do --sync on how to fetch the new updates, so you don't need to use any other git commands. Now this is excluding when you need to fix the git tree because of an modification done without telling git about it.
When you do git clone, you are effectively making your own git server, copy of the tree. You don't need to do anything else to make your own local .git server, as you already did when you cloned the "upstream" tree. When you sync/pull, it remembers where you grabbed the tree originally, and will pull from that. So this may be where you are getting into the issue, in that you cloned the portage tree, then you made a separate tree from that. So you are running into an issue of this:
Gentoo Tree "origin/master" -> Your original cloned copy -> "local" cloned copy
In short your local cloned copy is referring to your original cloned, and not the origin/master tree...
Now, I am no expert with git, as I know there is a lot I don't know of git yet. This being said, the easiest (not necessarily the best way) is simply completely deleting the portage tree on your system and reclone to start over (ensuring the configuration is correct). The other option is, you could possibly go in and change the git tree's configuration and hopefully get it point the the correct location. The configuration file I believe you need to change is in .git/config, at the root of the portage tree. Hopefully you should be able to just update the URL line to point to the correct location, and it will start working (though you may still have issues, hence why starting over on the git tree may be the easiest way).
For my .git/config, I have this for URL
| Code: |
[remote "origin"]
url = https://github.com/gentoo-mirror/gentoo
fetch = +refs/heads/master:refs/remotes/origin/master
|
Just so happens, that url is the same as what I have in my repos.conf... |
|
| Back to top |
|
|
Roman_Gruber
Advocate
Joined: 03 Oct 2006
Posts: 3846
Location: Austro Bavaria
|
| Posted: Tue Mar 28, 2017 3:08 pm Post subject: |
|
|
| ct85711 wrote: |
Just curious, how did you configure portage to use git |
Most likely this. Not sure if it has changed. I switched back to rsync.
# is comment, switch comment with non comment lines and you most probably have it.
| Code: | ASUS-G75VW roman # cat /etc/portage/repos.conf/gentoo.conf
[DEFAULT]
main-repo = gentoo
[gentoo]
location = /usr/portage
sync-type = rsync
sync-uri = rsync://rsync.gentoo.org/gentoo-portage
sync-rsync-vcs-ignore = true
#sync-type = git
#sync-uri = https://github.com/gentoo-mirror/gentoo.git
auto-sync = yes |
--
@ topic.
When I used it, it was similar as the kde overlay
| Code: | Unpacking objects: 100% (14/14), done.
From git://anongit.gentoo.org/proj/kde
258aa3e5b6..b8259a7774 master -> origin/master
Updating 258aa3e5b6..b8259a7774
Fast-forward
app-text/kbibtex/files/kbibtex-part-revert-reenable-qtoauth.patch | 10 ++++++----
app-text/kbibtex/files/kbibtex-revert-removing-qtoauth.patch | 28 ++++++++++------------------
kde-apps/kopete/kopete-17.03.80.ebuild | 7 +++----
kde-apps/kopete/kopete-17.04.49.9999.ebuild | 7 +++----
kde-apps/kopete/kopete-5.9999.ebuild | 12 ++++++------
kde-apps/kopete/kopete-9999.ebuild | 7 +++----
6 files changed, 31 insertions(+), 40 deletions(-)
*
* Succeeded:
* ------
* Successfully synchronized overlay "kde".
*
|
you should have seen something like this above for the gentoo repo too. |
|
| Back to top |
|
|
|
|
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
|
|
Portage & Programming
