magit-popup is the new black

See #1220.