Avoiding dirty work tree in the future