<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div class="">I have a local clone of a fork of GitHub/macports/macports-ports. This clone is used as repo by my port command. I have a fork&clone so I can contribute.</div><div class=""><br class=""></div><div class="">When I want to update macports itself, the command is ‘port self update’. But ‘port selfupdate’ also uses rsync to update my ports tree and that interferes with using git to stay in sync with upstream/master.</div><div class=""><br class=""></div><div class="">The way I can update my ports tree using git is:</div><div class=""><br class=""></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""># Updating the master of my fork&clone from the master of the original:<br class=""><br class="">git checkout master<span class="Apple-tab-span" style="white-space:pre"> </span># Go to branch master in my local clone<br class="">git pull upstream master<span class="Apple-tab-span" style="white-space:pre"> </span># Update my local clone master from the master of the remote upstream<br class=""><span class="Apple-tab-span" style="white-space:pre"> </span># (overwrites my local master with remote github/macports/master)<br class="">git reset --hard upstream/master<span class="Apple-tab-span" style="white-space:pre"> </span># Resets index and working tree of local clone/master from remote upstream<br class="">git push origin master --force <span class="Apple-tab-span" style="white-space:pre"> </span># Push local clone (~/MacPortsDev/macports-ports) master back</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># to my own remote fork (github/gctwnl/macports-ports)<br class=""><span class="Apple-tab-span" style="white-space:pre"> </span># NOTE: this closes all open pull-requests!<br class=""><span class="Apple-tab-span" style="white-space:pre"> </span># username: gctwnl<br class=""><span class="Apple-tab-span" style="white-space:pre"> </span># password: GitHub Token (in BitWarden)<br class="">portindex<span class="Apple-tab-span" style="white-space:pre"> </span># Tell macports to use this tree and update the macports index<br class=""></span></font><br class=""></div><div class="">Is there a way to do selfupdate on the base system only without messing with the ports tree, so the base system only? Or should I just run ‘port selfupdate’ and then use the above to do it again for the ports tree?</div><br class=""><div class="">
<div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div><div class="">Gerben Wierda (<a href="https://www.linkedin.com/in/gerbenwierda" class="">LinkedIn</a>)</div><div class=""><a href="https://ea.rna.nl/" class="">R&A Enterprise Architecture</a> (main site)<br class="">Book: <a href="https://ea.rna.nl/the-book/" class="">Chess and the Art of Enterprise Architecture</a><br class="">Book: <a href="https://ea.rna.nl/the-book-edition-iii/" class="">Mastering ArchiMate</a><br class=""></div></div></div></div></div></div></div></div>
</div>
<br class=""></body></html>