git p4 test: refactor marshal_dump