checkout: report upstream correctly even with loosely defined branch.*.merge