Extend test-branchmap to test
c51494c53841
(encoding fallback in branchmap to maintain compatibility with 1.3.x)
branchmap: fix defective fallback fix
0262bb59016f
The fix applied as
0262bb59016f doesn't work and is essentially a no-op.
This fix also adds a comment about the nature of the problem, and a test.