Chris, Correct!
I don’t want to use —autostash, as it may clobber WIP files in my local tree (per the git-pull man page). I ran git branch --set-upstream-to=origin/master master to get rid of the error. However, I shouldn’t use port sync (or for that matter port selfupdate), unless my local tree is clean. > On Oct 20, 2022, at 10:37 AM, Chris Jones <jon...@hep.phy.cam.ac.uk> wrote: > > Hi > > Go to your person checkout > > /Users/marius/Development/MacPorts/ports > > And then run > > /opt/local/bin/git pull --rebase --autostash > > You will I bet see the same issue, so the problem is nothing to do with > macports but your local checkout. > > Chris > >> On 20 Oct 2022, at 3:22 pm, Marius Schamschula <li...@schamschula.com> wrote: >> >> >> Chris, >> >> If I go to >> >> /opt/local/var/macports/sources/github.com/macports/macports-ports >> <http://github.com/macports/macports-ports> >> >> and run >> >> /opt/local/bin/git pull --rebase origin master >> >> Which I do as part of a macro which also runs portindex on that directory, >> everything works as expected. >> >> The only part of port selfupdate that’s failing is the port sync: >> >> marius@Mira macports-ports % sudo port -d sync >> DEBUG: Copying /Users/marius/Library/Preferences/com.apple.dt.Xcode.plist to >> /opt/local/var/macports/home/Library/Preferences >> ---> Updating the ports tree >> Synchronizing local ports tree from >> file:///Users/marius/Development/MacPorts/ports >> <file:///Users/marius/Development/MacPorts/ports> >> DEBUG: euid/egid changed to: 501/20, env: HOME=/Users/marius >> SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.084KBeK49L/Listeners >> DEBUG: /opt/local/bin/git pull --rebase --autostash >> DEBUG: system -W /Users/marius/Development/MacPorts/ports: >> /opt/local/bin/git pull --rebase --autostash >> There is no tracking information for the current branch. >> Please specify which branch you want to rebase against. >> See git-pull(1) for details. >> >> git pull <remote> <branch> >> >> If you wish to set tracking information for this branch you can do so with: >> >> git branch --set-upstream-to=origin/<branch> master >> >> Command failed: /opt/local/bin/git pull --rebase --autostash >> Exit code: 1 >> DEBUG: command execution failed >> while executing >> "system -W $dir $cmd" >> (procedure "macports::UpdateVCS" line 1) >> invoked from within >> "macports::UpdateVCS $cmd $dir" >> Syncing local Git ports tree failed >> DEBUG: euid/egid restored to: 0/0, env restored >> Synchronizing local ports tree from >> file:///opt/local/var/macports/sources/github.com/macports/macports-ports/ >> <file:///opt/local/var/macports/sources/github.com/macports/macports-ports/> >> DEBUG: euid/egid changed to: 501/20, env: HOME=/Users/marius >> SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.084KBeK49L/Listeners >> DEBUG: /opt/local/bin/git pull --rebase --autostash >> DEBUG: system -W >> /opt/local/var/macports/sources/github.com/macports/macports-ports: >> <http://github.com/macports/macports-ports:> /opt/local/bin/git pull >> --rebase --autostash >> There is no tracking information for the current branch. >> Please specify which branch you want to rebase against. >> See git-pull(1) for details. >> >> git pull <remote> <branch> >> >> If you wish to set tracking information for this branch you can do so with: >> >> git branch --set-upstream-to=origin/<branch> master >> >> Command failed: /opt/local/bin/git pull --rebase --autostash >> Exit code: 1 >> DEBUG: command execution failed >> while executing >> "system -W $dir $cmd" >> (procedure "macports::UpdateVCS" line 1) >> invoked from within >> "macports::UpdateVCS $cmd $dir" >> Syncing local Git ports tree failed >> DEBUG: euid/egid restored to: 0/0, env restored >> DEBUG: Synchronization of 2 sources failed >> while executing >> "mportsync [array get global_options]" >> port sync failed: Synchronization of 2 sources failed >> >> Note: this error doesn’t happen under MacPorts 2.7.2, as I rechecked two of >> my machines that haven’t been upgraded to MacPorts 2.8.0. >> >>> On Oct 20, 2022, at 8:31 AM, Christopher Jones <jon...@hep.phy.cam.ac.uk >>> <mailto:jon...@hep.phy.cam.ac.uk>> wrote: >>> >>> >>> No, thats not what I am saying. What you are doing works just fine for me… >>> >>> My own checkout has >>> >>> Oberon ~/Projects/MacPorts/ports > git remote -v >>> cjones g...@github.com >>> <mailto:g...@github.com>:cjones051073/macports-ports.git (fetch) >>> cjones g...@github.com >>> <mailto:g...@github.com>:cjones051073/macports-ports.git (push) >>> origin g...@github.com >>> <mailto:g...@github.com>:macports/macports-ports.git (fetch) >>> origin g...@github.com >>> <mailto:g...@github.com>:macports/macports-ports.git (push) >>> >>> So I have set origin to be the main repo, and my own clone is the ‘clones’ >>> remote. >>> >>> running port sync (or port selfupdate for that matter) works fine (at least >>> as far as the git pull part goes). >>> >>> Oberon ~/Projects/MacPorts/ports > sudo port -d selfupdate >>> DEBUG: Copying /Users/chris/Library/Preferences/com.apple.dt.Xcode.plist to >>> /opt/local/var/macports/home/Library/Preferences >>> DEBUG: MacPorts sources location: >>> /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs >>> <http://rsync.macports.org/macports/release/tarballs> >>> ---> Updating MacPorts base sources using rsync >>> DEBUG: system: /usr/bin/rsync -rtzvl --delete-after --include=/base.tar >>> --include=/base.tar.rmd160 --exclude=* >>> rsync://rsync.macports.org/macports/release/tarballs/ >>> <rsync://rsync.macports.org/macports/release/tarballs/> >>> /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs >>> <http://rsync.macports.org/macports/release/tarballs> >>> >>> Willkommen auf dem RSYNC-server auf ftp.fau.de <http://ftp.fau.de/>. >>> Nicht all unsere Mirror sind per rsync verfuegbar. >>> >>> Welcome to the RSYNC daemon on ftp.fau.de <http://ftp.fau.de/>. >>> Not all of our mirrors are available through rsync. >>> >>> >>> receiving file list ... done >>> ./ >>> >>> sent 66 bytes received 98 bytes 109.33 bytes/sec >>> total size is 113716736 speedup is 693394.73 >>> DEBUG: successful verification with key >>> /opt/local/share/macports/macports-pubkey.pem >>> DEBUG: system: /usr/bin/tar -C >>> /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/tmp >>> <http://rsync.macports.org/macports/release/tarballs/tmp> -xf >>> /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/base.tar >>> <http://rsync.macports.org/macports/release/tarballs/base.tar> >>> MacPorts base version 2.8.0 installed, >>> DEBUG: Rebuilding and reinstalling MacPorts if needed >>> MacPorts base version 2.8.0 downloaded. >>> ---> Updating the ports tree >>> Synchronizing local ports tree from >>> file:///Users/chris/Projects/MacPorts/ports >>> <file:///Users/chris/Projects/MacPorts/ports> >>> DEBUG: euid/egid changed to: 501/20, env: HOME=/Users/chris >>> SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.3Ry328lG9D/Listeners >>> DEBUG: /opt/local/bin/git pull --rebase --autostash >>> DEBUG: system -W /Users/chris/Projects/MacPorts/ports: /opt/local/bin/git >>> pull --rebase --autostash >>> Already up to date. >>> >>> So the git pull works just fine. ( It hangs after this but thats a >>> different issue. ) >>> >>> Why you are having problems I cannot say, but you should start by checking >>> how you have the remotes setup for your checkout. >>> >>> Chris >>> >>>> On 20 Oct 2022, at 1:52 pm, Marius Schamschula <li...@schamschula.com >>>> <mailto:li...@schamschula.com>> wrote: >>>> >>>> Chris, >>>> >>>> In other words, I shouldn’t ever run port selfupdate in my local repo >>>> (which syncs to my personal GitHub repo), but rather in the >>>> >>>> /opt/local/var/macports/sources/github.com/macports/macports-ports >>>> <http://github.com/macports/macports-ports> >>>> >>>> directory. Make sense, but the update has always worked in the past. >>>> >>>>> On Oct 20, 2022, at 7:26 AM, Christopher Jones <jon...@hep.phy.cam.ac.uk >>>>> <mailto:jon...@hep.phy.cam.ac.uk>> wrote: >>>>> >>>>> The message >>>>> >>>>> There is no tracking information for the current branch. >>>>> Please specify which branch you want to rebase against. >>>>> See git-pull(1) for details. >>>>> >>>>> git pull <remote> <branch> >>>>> >>>>> If you wish to set tracking information for this branch you can do so >>>>> with: >>>>> >>>>> git branch --set-upstream-to=origin/<branch> master >>>>> >>>>> Indicates you have >>>>> >>>>> /Users/marius/Development/MacPorts/ports >>>>> <file:///Users/marius/Development/MacPorts/ports> >>>>> >>>>> switched to a branch that does not have its tracking information set. >>>>> This normally happens if you have a feature branch (e.g. for a PR) >>>>> checked out, but the above is for master which is a bit weird. >>>>> >>>>> running >>>>> >>>>> git branch --set-upstream-to=origin/master master >>>>> >>>>> might fix this, but again, it is a bit odd you need to do this for your >>>>> master checkout, unless you have done something ‘odd’ to it such that it >>>>> has lost its tracking info. >>>>> >>>>> Chris >>>>> >>>>>> On 20 Oct 2022, at 12:17 pm, Marius Schamschula <li...@schamschula.com >>>>>> <mailto:li...@schamschula.com>> wrote: >>>>>> >>>>>> I’m seeing something very similar with MacPorts 2.8.0 (release) >>>>>> >>>>>> marius@Mira ports % sudo port selfupdate >>>>>> ---> Updating MacPorts base sources using rsync >>>>>> MacPorts base version 2.7.2 installed, >>>>>> MacPorts base version 2.8.0 downloaded. >>>>>> ---> Updating the ports tree >>>>>> ---> MacPorts base is outdated, installing new version 2.8.0 >>>>>> Installing new MacPorts release in /opt/local as root:wheel; permissions >>>>>> 0755 >>>>>> >>>>>> Error: Couldn't change permissions of the MacPorts sources at >>>>>> /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/base >>>>>> <http://rsync.macports.org/macports/release/tarballs/base> to root: >>>>>> child killed: kill signal >>>>>> Please run `port -v selfupdate' for details. >>>>>> Error: /opt/local/bin/port: port selfupdate failed: Couldn't change >>>>>> permissions of the MacPorts sources at >>>>>> /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/base >>>>>> <http://rsync.macports.org/macports/release/tarballs/base> to root: >>>>>> child killed: kill signal >>>>>> marius@Mira ports % sudo port -v selfupdate >>>>>> ---> Updating MacPorts base sources using rsync >>>>>> >>>>>> Willkommen auf dem RSYNC-server auf ftp.fau.de <http://ftp.fau.de/>. >>>>>> Nicht all unsere Mirror sind per rsync verfuegbar. >>>>>> >>>>>> Welcome to the RSYNC daemon on ftp.fau.de <http://ftp.fau.de/>. >>>>>> Not all of our mirrors are available through rsync. >>>>>> >>>>>> >>>>>> receiving file list ... done >>>>>> ./ >>>>>> >>>>>> sent 66 bytes received 98 bytes 109.33 bytes/sec >>>>>> total size is 113716736 speedup is 693394.73 >>>>>> MacPorts base version 2.8.0 installed, >>>>>> MacPorts base version 2.8.0 downloaded. >>>>>> ---> Updating the ports tree >>>>>> Synchronizing local ports tree from >>>>>> file:///Users/marius/Development/MacPorts/ports >>>>>> <file:///Users/marius/Development/MacPorts/ports> >>>>>> There is no tracking information for the current branch. >>>>>> Please specify which branch you want to rebase against. >>>>>> See git-pull(1) for details. >>>>>> >>>>>> git pull <remote> <branch> >>>>>> >>>>>> If you wish to set tracking information for this branch you can do so >>>>>> with: >>>>>> >>>>>> git branch --set-upstream-to=origin/<branch> master >>>>>> >>>>>> Command failed: /opt/local/bin/git pull --rebase --autostash >>>>>> Exit code: 1 >>>>>> Syncing local Git ports tree failed >>>>>> Synchronizing local ports tree from >>>>>> file:///opt/local/var/macports/sources/github.com/macports/macports-ports/ >>>>>> >>>>>> <file:///opt/local/var/macports/sources/github.com/macports/macports-ports/> >>>>>> From github.com <http://github.com/>:macports/macports-ports >>>>>> * [new tag] PRE_DESTROOT_TARGET -> >>>>>> PRE_DESTROOT_TARGET >>>>>> * [new tag] jkh-destrootification-base -> >>>>>> jkh-destrootification-base >>>>>> * [new tag] kevin-target-api-base -> >>>>>> kevin-target-api-base >>>>>> * [new tag] post-landon-trace -> >>>>>> post-landon-trace >>>>>> * [new tag] pre-chain-remove -> >>>>>> pre-chain-remove >>>>>> * [new tag] pre-landon-trace -> >>>>>> pre-landon-trace >>>>>> * [new tag] release_1_2_0-archive -> >>>>>> release_1_2_0-archive >>>>>> * [new tag] release_1_2_0-archive-rc1 -> >>>>>> release_1_2_0-archive-rc1 >>>>>> * [new tag] release_1_2_0-rc2-archive -> >>>>>> release_1_2_0-rc2-archive >>>>>> * [new tag] release_1_2_0-rc3-archive -> >>>>>> release_1_2_0-rc3-archive >>>>>> * [new tag] release_1_2_1-archive -> >>>>>> release_1_2_1-archive >>>>>> * [new tag] release_1_2_1-rc1-archive -> >>>>>> release_1_2_1-rc1-archive >>>>>> * [new tag] release_1_3_0-archive -> >>>>>> release_1_3_0-archive >>>>>> * [new tag] release_1_3_1-archive -> >>>>>> release_1_3_1-archive >>>>>> * [new tag] release_1_3_2-archive -> >>>>>> release_1_3_2-archive >>>>>> * [new tag] release_1_4_0-archive -> >>>>>> release_1_4_0-archive >>>>>> * [new tag] release_1_5_0-archive -> >>>>>> release_1_5_0-archive >>>>>> * [new tag] release_1_6_0-archive -> >>>>>> release_1_6_0-archive >>>>>> * [new tag] release_1_7_0-archive -> >>>>>> release_1_7_0-archive >>>>>> * [new tag] release_1_8_0-archive -> >>>>>> release_1_8_0-archive >>>>>> * [new tag] release_1_9_0-archive -> >>>>>> release_1_9_0-archive >>>>>> * [new tag] release_2_0_0-archive -> >>>>>> release_2_0_0-archive >>>>>> * [new tag] release_2_1_0-archive -> >>>>>> release_2_1_0-archive >>>>>> * [new tag] release_2_2_0-archive -> >>>>>> release_2_2_0-archive >>>>>> * [new tag] release_2_3_0-archive -> >>>>>> release_2_3_0-archive >>>>>> * [new tag] v2.4.0-archive -> v2.4.0-archive >>>>>> * [new tag] v2.5.0-archive -> v2.5.0-archive >>>>>> * [new tag] v2.6.0-archive -> v2.6.0-archive >>>>>> * [new tag] v2.7.0-archive -> v2.7.0-archive >>>>>> * [new tag] v2.8.0-archive -> v2.8.0-archive >>>>>> There is no tracking information for the current branch. >>>>>> Please specify which branch you want to rebase against. >>>>>> See git-pull(1) for details. >>>>>> >>>>>> git pull <remote> <branch> >>>>>> >>>>>> If you wish to set tracking information for this branch you can do so >>>>>> with: >>>>>> >>>>>> git branch --set-upstream-to=origin/<branch> master >>>>>> >>>>>> Command failed: /opt/local/bin/git pull --rebase --autostash >>>>>> Exit code: 1 >>>>>> Syncing local Git ports tree failed >>>>>> Error: Couldn't sync the ports tree: Synchronization of 2 sources failed >>>>>> Error: Follow https://guide.macports.org/#project.tickets >>>>>> <https://guide.macports.org/#project.tickets> if you believe there is a >>>>>> bug. >>>>>> Error: /opt/local/bin/port: port selfupdate failed: Couldn't sync the >>>>>> ports tree: Synchronization of 2 sources failed >>>>>> marius@Mira ports % port version >>>>>> Version: 2.8.0 >>>>>> marius@Mira ports % >>>>>> >>>>>>> On Oct 20, 2022, at 4:49 AM, Christopher Jones >>>>>>> <jon...@hep.phy.cam.ac.uk <mailto:jon...@hep.phy.cam.ac.uk>> wrote: >>>>>>> >>>>>>> Hi, >>>>>>> >>>>>>> I’m afraid I have no idea how to go about setting up a reproducer for >>>>>>> this. It seems it randomly comes and goes, so perhaps is related to >>>>>>> something else going on in the system (I am on macOS12 intel b.t.w.). >>>>>>> >>>>>>> The best I can do is monitor it and see if I can spot any pattern as to >>>>>>> when it happens or not. I am now on the official 2.8.0 release and >>>>>>> still see it happen, so lets also see if any others start to see the >>>>>>> same or not. >>>>>>> >>>>>>> Chris >>>>>>> >>>>>>>> On 19 Oct 2022, at 2:07 am, Joshua Root <j...@macports.org >>>>>>>> <mailto:j...@macports.org>> wrote: >>>>>>>> >>>>>>>> I can't repro this. The VCS sync logic hasn't changed since the >>>>>>>> privilege dropping fix in April. The only thing I can think of that >>>>>>>> might have made a difference is the update to Tcl 8.6 and the >>>>>>>> associated update of all the try/catch blocks. >>>>>>>> >>>>>>>> All that should be happening between running git and running portindex >>>>>>>> is the environment restore in VCSCleanup. You might have to do some >>>>>>>> more digging to figure out a repro recipe I'm afraid. >>>>>>>> >>>>>>>> - Josh >>>>>>>> >>>>>>>> On 2022-10-18 20:09 , Christopher Jones wrote: >>>>>>>>> Hi, >>>>>>>>> I’m not running the beta but the current master branch of base, but I >>>>>>>>> guess its similar. >>>>>>>>> I’m noticing with the latest version `sudo port sync` just hangs up >>>>>>>>> after updating my local git clone. e.g. >>>>>>>>> Oberon ~/Projects/MacPorts/ports > sudo port -d sync >>>>>>>>> DEBUG: Copying >>>>>>>>> /Users/chris/Library/Preferences/com.apple.dt.Xcode.plist to >>>>>>>>> /opt/local/var/macports/home/Library/Preferences >>>>>>>>> ---> Updating the ports tree >>>>>>>>> Synchronizing local ports tree from >>>>>>>>> file:///Users/chris/Projects/MacPorts/ports >>>>>>>>> <file:///Users/chris/Projects/MacPorts/ports> >>>>>>>>> DEBUG: euid/egid changed to: 501/20, env: HOME=/Users/chris >>>>>>>>> SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.vx1uKV7YtR/Listeners >>>>>>>>> DEBUG: /opt/local/bin/git pull --rebase --autostash >>>>>>>>> DEBUG: system -W /Users/chris/Projects/MacPorts/ports: >>>>>>>>> /opt/local/bin/git pull --rebase --autostash >>>>>>>>> Already up to date. >>>>>>>>> and thats it, it never gets any further and just hangs up there. >>>>>>>>> If I contrl-c the process I can get it to continue. >>>>>>>>> ^CDEBUG: euid/egid restored to: 0/0, env restored >>>>>>>>> DEBUG: system: /opt/local/bin/portindex >>>>>>>>> /Users/chris/Projects/MacPorts/ports >>>>>>>>> Creating port index in /Users/chris/Projects/MacPorts/ports >>>>>>>>> Total number of ports parsed: 0 >>>>>>>>> Ports successfully parsed: 0 >>>>>>>>> Ports failed: 0 >>>>>>>>> Up-to-date ports skipped: 29934 >>>>>>>>> any ideas what step its hanging up on ? >>>>>>>>> Chris >>>>>>>>>> On 14 Oct 2022, at 12:57 am, Joshua Root <j...@macports.org >>>>>>>>>> <mailto:j...@macports.org>> wrote: >>>>>>>>>> >>>>>>>>>> Well, only one issue has been reported against the beta so far (the >>>>>>>>>> NULL cxx_stdlib error that Ken saw.) I guess I'll tag an RC soon. >>>>>>>>>> >>>>>>>>>> - Josh >>>>>>>> >>>>>>> >>>>>> >>>>> >>>> >>> >>
