libs/cbi: workaround git deficiencies