Author Archives: Cipi Bad

Point of no return

Leave a reply

Point of no return is a moment in time following which turning back (or stopping) can be physically impossible, prohibitively expensive or dangerous.

Beware of fake point of no return.

If you did work a lot during the day for a task, but working time is finished and task not, this is (with few exceptions) a fake point of no return. There are big chances that you are already tired and if you continue working, the work you will do in overtime is low quality and task will eventually get more expensive then just taking a break and finishing the work next day.

git branches have diverged on openrtd, clean start

Leave a reply

After a very long long break, I wanted to updated the buildroot environment that I used to create firmware for my e-boda hd4all 500 player(openrtd).

For some reason, my git master branch and buildroot master branch have diverged.

All solutions from internet with merge or rebase didn’t work, so I went to do some manual work.

As history not so important in this case, I found the list of files I modified and I’ll manually port changes done on that files, doing some clean-up in parallel.

$ git log --no-merges --pretty="%H" --author="user" | while read commit_hash; do git show --oneline --name-only $commit_hash | tail -n+2; done | sort | uniq

My repository configuration is that:

  • local master branch is following buildroot master branch and pushed to github master branch
  • local openrtd branch is following github openrtd branch
  • toolchain_mipsel is a new git repository on git-hub and submodule on openrtd