Git Cherry Picking Across Forked Repos and Empty Commits

Recently I found myself in a situation where I wanted to bring in a specific upstream commit into a forked repository. Although these repos share a common history, the two repos had diverged enough that it wasn’t a straight-forward cherry-pick between branches. Instead, with clones of the two repositories I managed to cherry-pick as follows:

git --git-dir=..//.git format-patch -k -1 --stdout  | git am -3 -k

To complicate things further, a few days later, I found myself wanting to do the same thing, however, this time a submodule and another file had diverged enough that the patch no longer applied correctly. To get around this I had to:

git --git-dir=..//.git format-patch -k -1 --stdout  | patch -p1 --merge

Manually fix any of the still broken changes, then create a new commit with the changes.

These two stack overflow questions helped to work both of these issues out: https://stackoverflow.com/a/9507417 and https://stackoverflow.com/a/49537226

Finally, I’ve also in recent months found myself wanting to create a completely empty commit to kick off a downstream build process… much like you may touch a file to change its timestamp. To do this you can simply run:

git commit --allow-empty -m "Redeploy"

Docker CFLAGS march=native and illegal hardware instruction

I’ve recently hit an interesting issue involving Docker containers and compiled C code crashing code with illegal hardware instruction errors.

In a nutshell the Docker image was built on a server using Jenkins. It has been running fine until the underlying host orchestration software and physical hardware changed.

My solution has been to remove the build of the C code from the Dockerfile and instead put in inside a script which runs when the container starts.

For my use case this solution will work, however, it will require the C code to be compiled every time the Docker container runs.

Digging a little deeper, it appears that the underlying root issue may be the use of the CFLAGS march=native flag in the C code’s underlying Makefile.

A few posts on Stack Overflow (in particular, https://stackoverflow.com/questions/54039176/mtune-and-march-when-compiling-in-a-docker-image), suggest that removing this flag may make little difference to the run time of the compiled code. Which, again depending on the use case, may be a good option to try as well to resolve these problems.

Photos: Singapore 2017

In November 2017, I travelled to Singapore for an series of academic conferences. Almost two years later, I’ve edited some of the photos from the trip.

Site is now on AWS

I’m in the process of migrating the hosting of this site across to AWS.

So far everything is going smoothly, except for one of the domain alias which redirects here.

Photos: Hiking Lockleys Pylon

A little while back I went on a day hike with a friend to Lockleys Pylon in the Blue Mountains. Other than the craziness of driving a 2WD down what was clearly a 4WD track into the start of the hike it was a great day out.

Australia Must Stop Racism

I’m so angry with the Terrorist events in Christchurch. I’m angry at the rhetoric over the years in Australia towards anyone from a different or non-White background. I’m angry that Australia is so quick to label someone different as a threat. But when it comes to your own, you export them to my homeland, they destroy the peace as people are praying and the rhetoric is less.

Where’s the call to strip this Australian of his citizenship? Where’s the call to stop and ban all types of people with extremist white nationalist views? Why are major political parties in Australia, this morning, still publishing attack ads against immigration? Why is the news headlines labeling the attacker as a “angel” or “working class”.

There are hundreds of Australian based social media pages that express and support these extremist viewpoints. Why are there events in Melbourne this afternoon where speakers are encouraging these viewpoints to grow? Extremism is a disease that is nearly impossible to cure, once someone is radicalised there is little hope for rehabilitation. Yet these pages and groups remain. I’m all for free speech, but not for active and permitted hatred towards the other.

It’s time to stop saying “Australia is racist” and time for Australia (as a whole) to do something meaningful about it.

Give Nothing To Racism

The NBN: Misleading Information and Money-Grabbing Connection Costs

A few weeks ago the NBN became available in my street. Initially I was excited, until I started getting all the promotional and scare tactics filled material in my mailbox.

The TLDR version: switching to the NBN is expensive and not worthwhile until it is forced upon you.

The two worst offenders in the mail blitz were:

  • Telstra: I received advertising from Telstra telling me that I had already received notification that my current phone connection would be terminated soon. The reality was I had received no notification of this, and checking the NBN rollout map showed that the date of termination of my existing phone service was yet to be determined.
  • NBN CO: About a month after getting the letter from Telstra I got official notification of when my current phone service would be terminated, it is a little under a year way. This letter was filled with fear such as “Act now… before existing services are switched off” and it then continued further to state “NBN does not charge for standard installation”.

At this point I checked the NBN plans which my current internet provider offers. To meet my existing usage and to even match the speed I get on my ADSL connection would cost at least $15 more per month as well at least $100 in additional connection costs.

So much for no charge for installation. Annoyed I then checked against a number of other ISPs. All but one charges installation fees and all are a least $10/month more than my current connection.

With millions of people still to connect to the NBN these increases in fees will raise millions in profits for a variety of ISPs. None of which is good for consumers.

Given that the NBN has a reputation for poor service and support I will not be switching to the new network any time soon.