On 2014-09-23 16:01-0700 David MacMahon wrote: > Just to nit pick: isn't this more of a pre-push check rather than client side enforcement? Nit picking aside, I agree that with rebase-only it easier to check for potential push problems on the client side *before* pushing.
Hi David: Your comment above caught this nit-picker's attention. :-) What I was referring to (see README.developers) is we recommend each developer configure their local PLplot git repo using git config merge.ff only This command should stop merge commits of any kind for the local PLplot repo where it is run. I agree one of the client-side merges tested by this configuration occurs just before the push in our workflow so you could claim it is just a pre-push check. However, I think it is a little broader than that. For example, if the PLplot developer made some mistake by doing a git fetch and merge or equivalent git pull from some random unofficial private PLplot repository that included merge commits by accident, my understanding is this configuration option would catch that issue before the local repo was contaminated by those merge commits. > It sounds like you are on a prudent path forward! Thanks. So far so good. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ ------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
