git: simplify environment save/restore logic