Solved "git pull" src errors out

jb_fvwm2

Daemon

Reaction score: 205
Messages: 1,829

git pull... with /usr/src... "you have unstaged changes..." "cannot pull with rebase" ... [ never happened before ].
---------------------------------------------------------------------------
[ fixed this error below before posting this thread, below SOLVED]
pkg upgrade ... been this was about two days so far: "operation timed out." pkg0.isc.freebsd.org" [ never mind, just fixed it changing the
mirror to a working one... ] using fastest_pkg
and editing /usr/local/etc/pkg/repos/FreeBSD.conf
 

SirDice

Administrator
Staff member
Administrator
Moderator

Reaction score: 12,037
Messages: 38,485

git pull... with /usr/src... "you have unstaged changes..." "cannot pull with rebase" ... [ never happened before ].
You have edited the source at some point and haven't commited those changes. Check with git status.
 
OP
J

jb_fvwm2

Daemon

Reaction score: 205
Messages: 1,829

git restore /usr/src/share/mk/stage-install.sh repeated with two more files seems to have fixed, for now, this issue.
...............
omitted /src/ in this post unedited. sorry, typo.
 

SirDice

Administrator
Staff member
Administrator
Moderator

Reaction score: 12,037
Messages: 38,485

Makes very little sense, /usr/share isn't under /usr/src and therefor not part of the git checkout.
 

diizzy

Aspiring Daemon

Reaction score: 164
Messages: 535

It will barf (as expected) if it encounters changes compared to upstream unless you've told Git about them (ie committed them in your own local repository)
git reset --hard HEAD will reset all local changes and you really should make a habit of using git pull --ff-only instead of just git pull as depending on version git will do a merge operation which isn't want you want.
Do note that if your local repo already has merge operations committed git reset --hard HEAD wont necessarily fix your issue, unless you're experienced with git you're probably better off (it being easier to fix) deleting your local repo and start over
 
Top