cgit fixed upstream