On Friday 11 June 2021 04:20:14 Gene Heskett wrote: > Greetings all; > > I'm getting different results on the pi compared to a wintel system. > > As my local updating tool, I am using this script on both machines: > You wanted me on master-gtk3, so > === > #!/bin/bash > cd /media/pi/workspace/LinuxCNC-dev > # switch to master > git checkout master > git pull > # then back to master-gtk3 > git checkout master-gtk3 > git pull > === > This works on the wintel boxes, with the 2nd git pull occasionally > pulling in something. > > But on the rpi4, I get this: > > === > Date: Fri, 11 Jun 2021 00:04:03 -0400 > Switched to branch 'master' > Your branch is up to date with 'origin/master'. > Already up to date. > Switched to branch 'master-gtk3' > There is no tracking information for the current branch. > Please specify which branch you want to merge with. > 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-gtk3 > === > > So I need tutoring on how to do that, which I am guessing only needs > to be done once? Or does the script need help? > I should add that the wintel boxes are amd64, while the rpi4 is armhf, eg 32 bit.
And thank you. > === > Cheers, Gene Heskett Cheers, Gene Heskett -- "There are four boxes to be used in defense of liberty: soap, ballot, jury, and ammo. Please use in that order." -Ed Howdershelt (Author) If we desire respect for the law, we must first make the law respectable. - Louis D. Brandeis Genes Web page <http://geneslinuxbox.net:6309/gene> _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
