new update/upgrade script, ready for testing

sdetweil

@bobwilliams do a git pull, and show the results…

looks like git lied on the return code of the merge…

merge result rc= 0n Updating a31546b…500147e

lets try the output of this

git merge-tree `git merge-base master HEAD` HEAD master

thanks

bobwilliams

no change … I’m a simple user so don’t judge strictly

sdetweil

@bobwilliams no judging… my script should help with this

just gotta understand it…
the output of those two commands is the same?

cd ~/MagicMirror
git merge-tree `git merge-base master HEAD` HEAD master
then 
git pull

bobwilliams

@sdetweil said in new update/upgrade script, ready for testing:

git pull

pi@raspberrypi:~ $ cd ~/MagicMirror
pi@raspberrypi:~/MagicMirror $ git merge-tree git merge-base master HEAD HEAD master
pi@raspberrypi:~/MagicMirror $ git pull
Updating a31546b…500147e
error: Your local changes to the following files would be overwritten by merge:
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.sh
Please commit your changes or stash them before you merge.
Aborting
pi@raspberrypi:~/MagicMirror $

sdetweil

@bobwilliams said in new update/upgrade script, ready for testing:

git merge-tree git merge-base master HEAD HEAD master

there were two little backtics (left of 1 on us keyboard)
replace backtic in the next command with that keyboard character

 git merge-tree backtic git merge-base master HEAD backtic HEAD master

git pull results hm… we did a stash, why are those files still listed

try some more

git stash show
git stash 
git pull

bobwilliams

pi@raspberrypi:~/MagicMirror $ git merge-tree ~ git merge-base master HEAD ~ HEAD master
usage: git merge-tree
pi@raspberrypi:~/MagicMirror $ git stash show
No stash entries found.
pi@raspberrypi:~/MagicMirror $ git stash

*** Please tell me who you are.

Run

git config --global user.email “you@example.com”
git config --global user.name “Your Name”

to set your account’s default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got ‘pi@raspberrypi.(none)’)
Cannot save the current index state
pi@raspberrypi:~/MagicMirror $ git pull
Updating a31546b…500147e
error: Your local changes to the following files would be overwritten by merge:
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.sh
Please commit your changes or stash them before you merge.
Aborting
pi@raspberrypi:~/MagicMirror $

sdetweil

@bobwilliams great!!.. let me see what I can do about that…

also ~ git , that is the tilde character, i need the single quote leaning to the left (backtic), same keyboard key for me, just not with shift

sdetweil

@bobwilliams lets try this

git -c user.name=upgrade_script -c user.email=script@upgrade.com stash
then 
git stash show

bobwilliams

@sdetweil English is not my native language … sorry but I did not quite understand what to do

sdetweil

@bobwilliams no problems… no need to apologize… we will work thru it…

ps, I can’t speak ANYTHING in your language.