Merge branch 'sd/branch-copy' into maint

Code clean-up.

* sd/branch-copy:
config: avoid "write_in_full(fd, buf, len) != len" pattern

diff --cc config.c
Simple merge