Merge branch 'gc/bare-repo-discovery'

Fix-up for what has been merged to 'master' recently. * gc/bare-repo-discovery: config.c: NULL check when reading protected config