rerere: further de-dent do_plain_rerere()