On Wed, Sep 14, 2016 at 9:35 AM, Benjamin Reed <br...@apache.org> wrote: > 1) actually in the previous step that was just adding new files. you still > need the commit -a for the rest of the changes. that's my normal workflow.
I think that will be confusing for most folks. They typically stage all the changes and then commit or don't stage and use -a. > 2) i figured since we are using git now that we should use git's default. > the patch should work (by default it seems to strip the first path element). > does it not work for you? > It will fail precommit in it's current state. Patrick > On Tue, Sep 13, 2016 at 2:02 PM, Patrick Hunt <ph...@apache.org> wrote: >> >> Hi Ben. I didn't review it fully, but it looks like there are at least >> two issues: >> >> 1) you shouldn't have the person "git commit -a" given the previous >> commands added the files the user is interested in submitting. I think >> you just mean to "git commit" ? >> >> 2) you dropped the "--no-prefix" from the git diff - this will break >> existing tooling. It's also not consistent with the section "Applying >> a patch" from that same wiki page. I recommend you add back the >> --no-prefix until we are able to address (also impacts any pending >> patches created using the old style) >> >> Patrick >> >> On Mon, Sep 12, 2016 at 10:13 PM, Benjamin Reed <br...@apache.org> wrote: >> > i've updated the contributing to zookeeper wiki: >> > https://cwiki.apache.org/confluence/display/ZOOKEEPER/HowToContribute >> > >> > there are many ways to do things in git, so if others feel that there is >> > a >> > better way please updated. >> > >> > i think it would be cool to adopt a github based submission like other >> > projects have, but i'll leave that up to someone else that has used one >> > of >> > those work flows to propose something. >> > >> > thanx >> > ben >> > >> > ps - i have a small change to the site to fix some svn references, but >> > i'm >> > still trying to figure out if the site is on git or svn... >> > >> > On Mon, Sep 12, 2016 at 8:28 PM, Patrick Hunt <ph...@apache.org> wrote: >> >> >> >> Cool, thanks. >> >> >> >> I've re-enabled the precommit job, reconfigured it, and it seems to be >> >> working again. LMK if you notice any issues. >> >> >> >> Patrick >> >> >> >> On Mon, Sep 12, 2016 at 8:22 PM, Raúl Gutiérrez Segalés >> >> <r...@apache.org> >> >> wrote: >> >> > On 12 September 2016 at 17:48, Patrick Hunt <ph...@apache.org> wrote: >> >> > >> >> >> On Mon, Sep 12, 2016 at 10:15 AM, Raúl Gutiérrez Segalés >> >> >> <r...@itevenworks.net> wrote: >> >> >> > On 12 September 2016 at 09:58, Patrick Hunt <ph...@apache.org> >> >> >> > wrote: >> >> >> > >> >> >> >> Here it is, please take a look, review, and commit it to master >> >> >> >> (remember, needs to be git now :-) ) >> >> >> >> https://issues.apache.org/jira/browse/ZOOKEEPER-2576 >> >> >> > >> >> >> > >> >> >> > Merged: >> >> >> > >> >> >> > >> >> >> > https://git-wip-us.apache.org/repos/asf?p=zookeeper.git;a=commitdiff;h= >> >> >> 8c4082647f89b0a92fa00a2af8de84b3c7314e23 >> >> >> > >> >> >> > This is only needed in master? >> >> >> > >> >> >> >> >> >> Only on master. Our current pre-commit is only for master. If we >> >> >> move >> >> >> to something like Yetus I believe they will also check branches. >> >> >> >> >> >> Raul/Ben/et.al. can you commit the second part of the patch? I >> >> >> attached it to ZOOKEEPER-2576. Bit of a cleanup on the command >> >> >> naming >> >> >> (missed build.xml changes). Thanks. >> >> >> >> >> > >> >> > Merged: >> >> > >> >> > >> >> > https://git-wip-us.apache.org/repos/asf?p=zookeeper.git;a=commitdiff;h=b2a484cfe743116d2531fe5d1e1d78b3960c511e >> >> > >> >> > >> >> > -rgs >> > >> > > >
