git p4: refactor diffOpts calculation