Disclaimer: I'm trying to help you. Let me know if I'm annoying you instead and I'll shut up.
I am not annoyed and I really appreciate your help getting a better understanding of how git works, which is quite different than what I am used to, coming from CVS and later SVN. I just don't feel that keeping my few additional patches in a local git branch would really make my life easier, at least not given my usual workflow that basically so far has been:
- make -C /usr/ports update fetchindex
- portmaster -a -d
And then repeat step 2 on every other machine that has the same ports tree mounted read-only via NFS.
Now after I made the switch to git not much has changed so far:
- git -C /usr/ports pull --ff-only
- portmaster -a -d
and again repeat step 2 on other machines. As I wrote in another thread, I decided to ditch the index and go without it, so I will not run
anymore as part of my daily update routine. I could continue using
make -C /usr/ports update
which effectively does a
but I decided against that and defined an alias that includes the --ff-only
flag and is more convenient to use, as I dont have to specify the directory manually.
You see the sole purpose of my local copy of the ports tree is to keep my machines updated. I don't use quarterly branches (in fact I never have), HEAD is the only thing I need, which is also why I decided to go with a shallow, single branch clone for the time being. The few additional files I keep in there were mostly born out of necessity and should that necessity cease to exist, I will more than happily remove those files as I generally prefer to have a clean tree. In some cases I almost forgot I put those files there long ago and running
gives a quick overview of what files are there and where, that's fine by me.
git comes with substantial differences compared to CVS/SVN that are not easy to wrap your head around at first. But I guess it will get better once I start using git for my own pet projects or maybe even convert some of my repositories. So far I can say that I love the speed of git and the savings in disk space. I guess I will keep it